[commit: packages/Cabal] ghc-head: Include dist/build/autogen dir in the -I search list for c-sources. (4dc2a10)

git at git.haskell.org git at git.haskell.org
Mon Aug 26 23:26:29 CEST 2013


Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=4dc2a108c73daa842bb37fabb31d21f12e998985

>---------------------------------------------------------------

commit 4dc2a108c73daa842bb37fabb31d21f12e998985
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri May 31 20:40:42 2013 +0200

    Include dist/build/autogen dir in the -I search list for c-sources.
    
    Fixes #1351.


>---------------------------------------------------------------

4dc2a108c73daa842bb37fabb31d21f12e998985
 Cabal/Distribution/Simple/GHC.hs |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs
index 939715b..1ebbf49 100644
--- a/Cabal/Distribution/Simple/GHC.hs
+++ b/Cabal/Distribution/Simple/GHC.hs
@@ -1074,7 +1074,8 @@ componentCcGhcOptions verbosity lbi bi clbi pref filename =
       ghcOptMode           = toFlag GhcModeCompile,
       ghcOptInputFiles     = [filename],
 
-      ghcOptCppIncludePath = odir : PD.includeDirs bi,
+      ghcOptCppIncludePath = [autogenModulesDir lbi, odir]
+                                   ++ PD.includeDirs bi,
       ghcOptPackageDBs     = withPackageDB lbi,
       ghcOptPackages       = componentPackageDeps clbi,
       ghcOptCcOptions      = PD.ccOptions bi





More information about the ghc-commits mailing list