diff options
Diffstat (limited to 'compiler')
| -rwxr-xr-x | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | compiler/ghc.mk | 2 | ||||
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 09b0fb9335..56d9538524 100755 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -81,7 +81,7 @@ Library if flag(ghci) Build-Depends: template-haskell CPP-Options: -DGHCI - Include-Dirs: ../libffi/build/include + Include-Dirs: ../rts/dist/build Build-Depends: bin-package-db Build-Depends: hoopl diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 4b84924609..43b609b7b5 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -265,7 +265,7 @@ PRIMOP_BITS = compiler/primop-data-decl.hs-incl \ compiler_CPP_OPTS += -I$(GHC_INCLUDE_DIR) compiler_CPP_OPTS += ${GhcCppOpts} -compiler/stage2/build/LibFFI.hs : libffi/dist-install/build/ffi.h +compiler/stage2/build/LibFFI.hs : $(ffi_HEADER) $(PRIMOPS_TXT) compiler/parser/Parser.y: %: %.pp compiler/stage1/$(PLATFORM_H) $(CPP) $(RAWCPP_FLAGS) -P $(compiler_CPP_OPTS) -x c $< | grep -v '^#pragma GCC' > $@ diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index b655425f2e..99d3ce7424 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1428,8 +1428,9 @@ mkExtraCObj dflags xs ([Option "-c", FileOption "" cFile, Option "-o", - FileOption "" oFile] ++ - map (FileOption "-I") (includeDirs rtsDetails)) + FileOption "" oFile] + ++ map SysTools.Option (getOpts dflags opt_c) -- see #5528 + ++ map (FileOption "-I") (includeDirs rtsDetails)) return oFile mkExtraObjToLinkIntoBinary :: DynFlags -> [PackageId] -> IO FilePath |