diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-13 22:13:55 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-13 22:13:55 +0100 |
| commit | 845187063b479c6caf423463073a8e31ec238523 (patch) | |
| tree | 019f9101327c4f3db7724774cdf965250cbf92a8 | |
| parent | 5288e9ab7bb6d51e69491654e23ee00dcbbb1944 (diff) | |
| download | haskell-wip/libffi-cabal-fixes.tar.gz | |
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index bb67f7ba56..28f79eb6c0 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -108,7 +108,6 @@ packageArgs = do -------------------------------- ghcPrim ------------------------------- , package ghcPrim ? mconcat [ builder (Cabal Flags) ? arg "include-ghc-prim" - , builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir , builder (Cc CompileC) ? (not <$> flag CcLlvmBackend) ? input "**/cbits/atomic.c" ? arg "-Wno-sync-nand" ] @@ -384,6 +383,7 @@ rtsPackageArgs = package rts ? do , useLibffiForAdjustors `cabalFlag` "libffi-adjustors" , Debug `wayUnit` way `cabalFlag` "find-ptr" ] + , builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir , builder (Cabal Setup) ? mconcat [ cabalExtraDirs libdwIncludeDir libdwLibraryDir , cabalExtraDirs libnumaIncludeDir libnumaLibraryDir |