fix for #187 -- directory of Paths_packagename is included when looki…

…ng for source files
haskell · Apr 12, 2008 · 6bc049c · 6bc049c
1 parent 13d4b4f
commit 6bc049c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Distribution/Simple/GHC.hs b/Distribution/Simple/GHC.hs
@@ -588,9 +588,9 @@ ghcOptions lbi bi odir
      =  ["-hide-all-packages"]
      ++ (if splitObjs lbi then ["-split-objs"] else [])
      ++ ["-i"]
-     ++ ["-i" ++ autogenModulesDir lbi]
      ++ ["-i" ++ odir]
      ++ ["-i" ++ l | l <- nub (hsSourceDirs bi)]
+     ++ ["-i" ++ autogenModulesDir lbi]
      ++ ["-I" ++ odir]
      ++ ["-I" ++ dir | dir <- includeDirs bi]
      ++ ["-optP" ++ opt | opt <- cppOptions bi]

diff --git a/Distribution/Simple/Haddock.hs b/Distribution/Simple/Haddock.hs
@@ -322,8 +322,8 @@ ghcSimpleOptions lbi bi mockDir
   ++ (concat [ ["-package", display pkg] | pkg <- packageDeps lbi ])
   ++ ["-i"]
   ++ hcOptions GHC bi
-  ++ ["-i" ++ autogenModulesDir lbi]
   ++ ["-i" ++ l | l <- nub (hsSourceDirs bi)]
+  ++ ["-i" ++ autogenModulesDir lbi]
   ++ ["-i" ++ mockDir]
   ++ ["-I" ++ dir | dir <- PD.includeDirs bi]
   ++ ["-odir", mockDir]

diff --git a/Distribution/Simple/JHC.hs b/Distribution/Simple/JHC.hs
@@ -157,8 +157,8 @@ constructJHCCmdLine lbi bi _odir verbosity =
      ++ extensionsToFlags (compiler lbi) (extensions bi)
      ++ hcOptions JHC bi
      ++ ["--noauto","-i-"]
-     ++ ["-i", autogenModulesDir lbi]
      ++ concat [["-i", l] | l <- nub (hsSourceDirs bi)]
+     ++ ["-i", autogenModulesDir lbi]
      ++ ["-optc" ++ opt | opt <- PD.ccOptions bi]
      ++ (concat [ ["-p", display pkg] | pkg <- packageDeps lbi ])
 

diff --git a/Distribution/Simple/PreProcess.hs b/Distribution/Simple/PreProcess.hs
@@ -64,6 +64,7 @@ import Distribution.Package
 import Distribution.Simple.Compiler
          ( CompilerFlavor(..), Compiler(..), compilerFlavor, compilerVersion )
 import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..))
+import Distribution.Simple.BuildPaths (autogenModulesDir)
 import Distribution.Simple.Utils
          ( createDirectoryIfMissingVerbose, readUTF8File, writeUTF8File
          , die, setupMessage, intercalate
@@ -173,7 +174,7 @@ preprocessSources pkg_descr lbi forSDist verbosity handlers = do
         setupMessage verbosity "Preprocessing library" (packageId pkg_descr)
         let bi = libBuildInfo lib
         let biHandlers = localHandlers bi
-        sequence_ [ preprocessModule (hsSourceDirs bi) (buildDir lbi) forSDist 
+        sequence_ [ preprocessModule (hsSourceDirs bi ++ [autogenModulesDir lbi]) (buildDir lbi) forSDist
                                      modu verbosity builtinSuffixes biHandlers
                   | modu <- libModules pkg_descr]
     unless (null (executables pkg_descr)) $
@@ -182,7 +183,7 @@ preprocessSources pkg_descr lbi forSDist verbosity handlers = do
         let bi = buildInfo theExe
         let biHandlers = localHandlers bi
         let exeDir = buildDir lbi </> exeName theExe </> exeName theExe ++ "-tmp"
-        sequence_ [ preprocessModule (hsSourceDirs bi) exeDir forSDist
+        sequence_ [ preprocessModule (hsSourceDirs bi ++ [autogenModulesDir lbi]) exeDir forSDist
                                      modu verbosity builtinSuffixes biHandlers
                   | modu <- otherModules bi]
         preprocessModule (hsSourceDirs bi) exeDir forSDist