diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-06-11 22:51:38 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-14 15:35:59 -0400 |
| commit | 8bab9ff1e09c1566a4105146bd636634a24928b9 (patch) | |
| tree | 8c126bab6e4f47f80eede3a8c54dbf7040e1e2e0 | |
| parent | e4137c486a3df66b49395beea7efc6e200cc9bac (diff) | |
| download | haskell-8bab9ff1e09c1566a4105146bd636634a24928b9.tar.gz | |
hadrian: Fix rts include and library paths
Fixes two bugs:
* (?) and (<>) associated in a surprising way
* We neglected to include libdw paths in the rts configure flags
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 2af29eaaff..8a7aef5914 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -386,9 +386,12 @@ rtsPackageArgs = package rts ? do , any (wayUnit Dynamic) rtsWays ? arg "dynamic" , Debug `wayUnit` way ? arg "find-ptr" ] - , builder (Cabal Setup) ? - if not (null libnumaLibraryDir) then arg ("--extra-lib-dirs="++libnumaLibraryDir) else mempty - <> if not (null libnumaIncludeDir) then arg ("--extra-include-dirs="++libnumaIncludeDir) else mempty + , builder (Cabal Setup) ? mconcat + [ if not (null libdwLibraryDir) then arg ("--extra-lib-dirs="++libdwLibraryDir) else mempty + , if not (null libdwIncludeDir) then arg ("--extra-include-dirs="++libdwIncludeDir) else mempty + , if not (null libnumaLibraryDir) then arg ("--extra-lib-dirs="++libnumaLibraryDir) else mempty + , if not (null libnumaIncludeDir) then arg ("--extra-include-dirs="++libnumaIncludeDir) else mempty + ] , builder (Cc FindCDependencies) ? cArgs , builder (Ghc CompileCWithGhc) ? map ("-optc" ++) <$> cArgs , builder Ghc ? ghcArgs |