Merge pull request #4650 from commercialhaskell/4527-order-dependent-…

…search-path

Make libs and includes order-dependent (fixes #4527)

ChangeLog.md

@@ -164,6 +164,8 @@ Bug fixes:
 * Using `--ghc-options` with `stack script --compile` now works.
 * Ensure the detailed-0.9 type tests work.
   See [#4453](https://github.com/commercialhaskell/stack/issues/4453).
+* Extra include and lib dirs are now order-dependent. See
+  [#4527](https://github.com/commercialhaskell/stack/issues/4527).
 
 ## v1.9.3
 

src/Stack/Options/ConfigParser.hs

@@ -2,7 +2,6 @@
 module Stack.Options.ConfigParser where
 
 import           Data.Char
-import qualified Data.Set                          as Set
 import           Options.Applicative
 import           Options.Applicative.Builder.Extra
 import           Path
@@ -88,20 +87,20 @@ configOptsParser currentDir hide0 =
            <> help "Number of concurrent jobs to run"
            <> hide
             ))
-    <*> fmap Set.fromList (many ((currentDir FilePath.</>) <$> strOption
+    <*> many ((currentDir FilePath.</>) <$> strOption
             ( long "extra-include-dirs"
            <> metavar "DIR"
            <> completer dirCompleter
            <> help "Extra directories to check for C header files"
            <> hide
-            )))
-    <*> fmap Set.fromList (many ((currentDir FilePath.</>) <$> strOption
+            ))
+    <*> many ((currentDir FilePath.</>) <$> strOption
             ( long "extra-lib-dirs"
            <> metavar "DIR"
            <> completer dirCompleter
            <> help "Extra directories to check for libraries"
            <> hide
-            )))
+            ))
     <*> optionalFirst (absFileOption
              ( long "with-gcc"
             <> metavar "PATH-TO-GCC"

src/Stack/Package.hs

@@ -338,8 +338,8 @@ data BioInput = BioInput
     , biAddPackages :: ![PackageName]
     , biBuildInfo :: !BuildInfo
     , biDotCabalPaths :: ![DotCabalPath]
-    , biConfigLibDirs :: !(Set FilePath)
-    , biConfigIncludeDirs :: !(Set FilePath)
+    , biConfigLibDirs :: ![FilePath]
+    , biConfigIncludeDirs :: ![FilePath]
     , biComponentName :: !NamedComponent
     , biCabalVersion :: !Version
     }
@@ -407,17 +407,15 @@ generateBuildInfoOpts BioInput {..} =
     toIncludeDir "." = Just biCabalDir
     toIncludeDir relDir = concatAndColapseAbsDir biCabalDir relDir
     includeOpts =
-        map ("-I" <>) (configExtraIncludeDirs <> pkgIncludeOpts)
-    configExtraIncludeDirs = S.toList biConfigIncludeDirs
+        map ("-I" <>) (biConfigIncludeDirs <> pkgIncludeOpts)
     pkgIncludeOpts =
         [ toFilePathNoTrailingSep absDir
         | dir <- includeDirs biBuildInfo
         , absDir <- handleDir dir
         ]
     libOpts =
         map ("-l" <>) (extraLibs biBuildInfo) <>
-        map ("-L" <>) (configExtraLibDirs <> pkgLibDirs)
-    configExtraLibDirs = S.toList biConfigLibDirs
+        map ("-L" <>) (biConfigLibDirs <> pkgLibDirs)
     pkgLibDirs =
         [ toFilePathNoTrailingSep absDir
         | dir <- extraLibDirs biBuildInfo

src/Stack/Path.hs

@@ -10,7 +10,6 @@ module Stack.Path
 
 import           Stack.Prelude
 import           Data.List (intercalate)
-import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
 import           Lens.Micro (lens)
@@ -186,10 +185,10 @@ paths =
       , WithoutHaddocks $ view $ configL.to configLocalBin.to toFilePathNoTrailingSep.to T.pack)
     , ( "Extra include directories"
       , "extra-include-dirs"
-      , WithoutHaddocks $ T.intercalate ", " . map T.pack . Set.elems . configExtraIncludeDirs . view configL )
+      , WithoutHaddocks $ T.intercalate ", " . map T.pack . configExtraIncludeDirs . view configL )
     , ( "Extra library directories"
       , "extra-library-dirs"
-      , WithoutHaddocks $ T.intercalate ", " . map T.pack . Set.elems . configExtraLibDirs . view configL )
+      , WithoutHaddocks $ T.intercalate ", " . map T.pack . configExtraLibDirs . view configL )
     , ( "Snapshot package database"
       , "snapshot-pkg-db"
       , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piSnapDb )

src/Stack/Setup.hs

@@ -443,12 +443,12 @@ withNewLocalBuildTargets targets f = do
 -- | Add the include and lib paths to the given Config
 addIncludeLib :: ExtraDirs -> Config -> Config
 addIncludeLib (ExtraDirs _bins includes libs) config = config
-    { configExtraIncludeDirs = Set.union
-        (configExtraIncludeDirs config)
-        (Set.fromList (map toFilePathNoTrailingSep includes))
-    , configExtraLibDirs = Set.union
-        (configExtraLibDirs config)
-        (Set.fromList (map toFilePathNoTrailingSep libs))
+    { configExtraIncludeDirs =
+        configExtraIncludeDirs config ++
+        map toFilePathNoTrailingSep includes
+    , configExtraLibDirs =
+        configExtraLibDirs config ++
+        map toFilePathNoTrailingSep libs
     }
 
 -- | Ensure compiler (ghc or ghcjs) is installed and provide the PATHs to add if necessary

src/Stack/Types/Build.hs

@@ -629,8 +629,8 @@ configureOptsNoDir econfig bco deps isLocal package = concat
                        flagNameString name)
                     (Map.toList flags)
     , concatMap (\x -> [compilerOptionsCabalFlag wc, T.unpack x]) (packageGhcOptions package)
-    , map ("--extra-include-dirs=" ++) (Set.toList (configExtraIncludeDirs config))
-    , map ("--extra-lib-dirs=" ++) (Set.toList (configExtraLibDirs config))
+    , map ("--extra-include-dirs=" ++) (configExtraIncludeDirs config)
+    , map ("--extra-lib-dirs=" ++) (configExtraLibDirs config)
     , maybe [] (\customGcc -> ["--with-gcc=" ++ toFilePath customGcc]) (configOverrideGccPath config)
     , ["--ghcjs" | wc == Ghcjs]
     , ["--exact-configuration" | useExactConf]

src/Stack/Types/Config.hs

@@ -301,9 +301,9 @@ data Config =
          -- ^ How many concurrent jobs to run, defaults to number of capabilities
          ,configOverrideGccPath     :: !(Maybe (Path Abs File))
          -- ^ Optional gcc override path
-         ,configExtraIncludeDirs    :: !(Set FilePath)
+         ,configExtraIncludeDirs    :: ![FilePath]
          -- ^ --extra-include-dirs arguments
-         ,configExtraLibDirs        :: !(Set FilePath)
+         ,configExtraLibDirs        :: ![FilePath]
          -- ^ --extra-lib-dirs arguments
          ,configConcurrentTests     :: !Bool
          -- ^ Run test suites concurrently
@@ -703,9 +703,9 @@ data ConfigMonoid =
     -- ^ Used for overriding the GHC build
     ,configMonoidJobs                :: !(First Int)
     -- ^ See: 'configJobs'
-    ,configMonoidExtraIncludeDirs    :: !(Set FilePath)
+    ,configMonoidExtraIncludeDirs    :: ![FilePath]
     -- ^ See: 'configExtraIncludeDirs'
-    ,configMonoidExtraLibDirs        :: !(Set FilePath)
+    ,configMonoidExtraLibDirs        :: ![FilePath]
     -- ^ See: 'configExtraLibDirs'
     , configMonoidOverrideGccPath    :: !(First (Path Abs File))
     -- ^ Allow users to override the path to gcc
@@ -808,10 +808,10 @@ parseConfigMonoidObject rootDir obj = do
     configMonoidGHCVariant <- First <$> obj ..:? configMonoidGHCVariantName
     configMonoidGHCBuild <- First <$> obj ..:? configMonoidGHCBuildName
     configMonoidJobs <- First <$> obj ..:? configMonoidJobsName
-    configMonoidExtraIncludeDirs <- fmap (Set.map (toFilePath rootDir FilePath.</>)) $
-        obj ..:?  configMonoidExtraIncludeDirsName ..!= Set.empty
-    configMonoidExtraLibDirs <- fmap (Set.map (toFilePath rootDir FilePath.</>)) $
-        obj ..:?  configMonoidExtraLibDirsName ..!= Set.empty
+    configMonoidExtraIncludeDirs <- map (toFilePath rootDir FilePath.</>) <$>
+        obj ..:?  configMonoidExtraIncludeDirsName ..!= []
+    configMonoidExtraLibDirs <- map (toFilePath rootDir FilePath.</>) <$>
+        obj ..:?  configMonoidExtraLibDirsName ..!= []
     configMonoidOverrideGccPath <- First <$> obj ..:? configMonoidOverrideGccPathName
     configMonoidOverrideHpack <- First <$> obj ..:? configMonoidOverrideHpackName
     configMonoidConcurrentTests <- First <$> obj ..:? configMonoidConcurrentTestsName