Rearrange genPureArgs for hsc2hs without changing semantics

sergv · sergv · commit 8bcffbbdc323 · 2025-06-19T23:02:00.000+01:00
diff --git a/Cabal/src/Distribution/Simple/PreProcess.hs b/Cabal/src/Distribution/Simple/PreProcess.hs
@@ -513,101 +513,104 @@ ppHsc2hs bi lbi clbi =
     -- directly, or via a response file.
     genPureArgs :: Version -> ConfiguredProgram -> String -> String -> [String]
     genPureArgs hsc2hsVersion gccProg inFile outFile =
-      -- Additional gcc options
-      [ "--cflag=" ++ opt
-      | opt <-
-          programDefaultArgs gccProg
-            ++ programOverrideArgs gccProg
-      ]
-        ++ [ "--lflag=" ++ opt
-           | opt <-
-              programDefaultArgs gccProg
-                ++ programOverrideArgs gccProg
-           ]
-        -- OSX frameworks:
-        ++ [ what ++ "=-F" ++ opt
-           | isOSX
-           , opt <- nub (concatMap Installed.frameworkDirs pkgs)
-           , what <- ["--cflag", "--lflag"]
-           ]
-        ++ [ "--lflag=" ++ arg
-           | isOSX
-           , opt <- map getSymbolicPath (PD.frameworks bi) ++ concatMap Installed.frameworks pkgs
-           , arg <- ["-framework", opt]
-           ]
-        -- Note that on ELF systems, wherever we use -L, we must also use -R
-        -- because presumably that -L dir is not on the normal path for the
-        -- system's dynamic linker. This is needed because hsc2hs works by
-        -- compiling a C program and then running it.
-
-        ++ ["--cflag=" ++ opt | opt <- platformDefines lbi]
-        -- Options from the current package:
-        ++ ["--cflag=-I" ++ u dir | dir <- PD.includeDirs bi]
-        ++ [ "--cflag=-I" ++ u (buildDir lbi </> unsafeCoerceSymbolicPath relDir)
-           | relDir <- mapMaybe symbolicPathRelative_maybe $ PD.includeDirs bi
-           ]
-        ++ [ "--cflag=" ++ opt
-           | opt <-
-              PD.ccOptions bi
-                ++ PD.cppOptions bi
-                -- hsc2hs uses the C ABI
-                -- We assume that there are only C sources
-                -- and C++ functions are exported via a C
-                -- interface and wrapped in a C source file.
-                -- Therefore we do not supply C++ flags
-                -- because there will not be C++ sources.
-                --
-                -- DO NOT add PD.cxxOptions unless this changes!
-           ]
-        ++ [ "--cflag=" ++ opt
-           | opt <-
-              [ "-I" ++ u (autogenComponentModulesDir lbi clbi)
-              , "-I" ++ u (autogenPackageModulesDir lbi)
-              , "-include"
-              , u $ autogenComponentModulesDir lbi clbi </> makeRelativePathEx cppHeaderName
-              ]
-           ]
-        ++ [ "--lflag=-L" ++ u opt
-           | opt <-
-              if withFullyStaticExe lbi
-                then PD.extraLibDirsStatic bi
-                else PD.extraLibDirs bi
-           ]
-        ++ [ "--lflag=-Wl,-R," ++ u opt
-           | isELF
-           , opt <-
-              if withFullyStaticExe lbi
-                then PD.extraLibDirsStatic bi
-                else PD.extraLibDirs bi
-           ]
-        ++ ["--lflag=-l" ++ opt | opt <- PD.extraLibs bi]
-        ++ ["--lflag=" ++ opt | opt <- PD.ldOptions bi]
-        -- Options from dependent packages
-        ++ [ "--cflag=" ++ opt
-           | pkg <- pkgs
-           , opt <-
-              ["-I" ++ opt | opt <- Installed.includeDirs pkg]
-                ++ Installed.ccOptions pkg
-           ]
-        ++ [ "--lflag=" ++ opt
-           | pkg <- pkgs
-           , opt <-
-              ["-L" ++ opt | opt <- Installed.libraryDirs pkg]
-                ++ [ "-Wl,-R," ++ opt | isELF, opt <- Installed.libraryDirs pkg
-                   ]
-                ++ [ "-l" ++ opt
-                   | opt <-
-                      if withFullyStaticExe lbi
-                        then Installed.extraLibrariesStatic pkg
-                        else Installed.extraLibraries pkg
-                   ]
-                ++ Installed.ldOptions pkg
-           ]
+      cflags
+        ++ ldflags
         ++ preccldFlags
         ++ hsc2hsOptions bi
         ++ postccldFlags
         ++ ["-o", outFile, inFile]
       where
+        ldflags = map ("--lflag=" ++) $ concat
+          [ programDefaultArgs gccProg ++ programOverrideArgs gccProg
+          , osxFrameworkDirs
+          , [ arg
+            | isOSX
+            , opt <- map getSymbolicPath (PD.frameworks bi) ++ concatMap Installed.frameworks pkgs
+            , arg <- ["-framework", opt]
+            ]
+
+          -- Note that on ELF systems, wherever we use -L, we must also use -R
+          -- because presumably that -L dir is not on the normal path for the
+          -- system's dynamic linker. This is needed because hsc2hs works by
+          -- compiling a C program and then running it.
+
+          -- Options from the current package:
+
+          , [ "-L" ++ u opt
+            | opt <-
+               if withFullyStaticExe lbi
+                 then PD.extraLibDirsStatic bi
+                 else PD.extraLibDirs bi
+            ]
+          , [ "-Wl,-R," ++ u opt
+            | isELF
+            , opt <-
+               if withFullyStaticExe lbi
+                 then PD.extraLibDirsStatic bi
+                 else PD.extraLibDirs bi
+            ]
+          , ["-l" ++ opt | opt <- PD.extraLibs bi]
+          , PD.ldOptions bi
+
+          -- Options from dependent packages
+          , [ opt
+            | pkg <- pkgs
+            , opt <-
+               ["-L" ++ opt | opt <- Installed.libraryDirs pkg]
+                 ++ [ "-Wl,-R," ++ opt | isELF, opt <- Installed.libraryDirs pkg
+                    ]
+                 ++ [ "-l" ++ opt
+                    | opt <-
+                       if withFullyStaticExe lbi
+                         then Installed.extraLibrariesStatic pkg
+                         else Installed.extraLibraries pkg
+                    ]
+                 ++ Installed.ldOptions pkg
+            ]
+          ]
+
+        cflags = map ("--cflag=" ++) $ concat
+          [ programDefaultArgs gccProg ++ programOverrideArgs gccProg
+          , osxFrameworkDirs
+          , platformDefines lbi
+
+          -- Options from the current package:
+          , [ "-I" ++ u dir | dir <- PD.includeDirs bi ]
+          , [ "-I" ++ u (buildDir lbi </> unsafeCoerceSymbolicPath relDir)
+            | relDir <- mapMaybe symbolicPathRelative_maybe $ PD.includeDirs bi
+            ]
+
+          -- hsc2hs uses the C ABI
+          -- We assume that there are only C sources
+          -- and C++ functions are exported via a C
+          -- interface and wrapped in a C source file.
+          -- Therefore we do not supply C++ flags
+          -- because there will not be C++ sources.
+          --
+          -- DO NOT add PD.cxxOptions unless this changes!
+          , PD.ccOptions bi ++ PD.cppOptions bi
+
+          , [ "-I" ++ u (autogenComponentModulesDir lbi clbi)
+            , "-I" ++ u (autogenPackageModulesDir lbi)
+            , "-include"
+            , u $ autogenComponentModulesDir lbi clbi </> makeRelativePathEx cppHeaderName
+            ]
+
+          -- Options from dependent packages
+          , [ opt
+            | pkg <- pkgs
+            , opt <-
+               ["-I" ++ opt | opt <- Installed.includeDirs pkg]
+                 ++ Installed.ccOptions pkg
+            ]
+          ]
+
+        osxFrameworkDirs =
+          [ "-F" ++ opt
+          | isOSX
+          , opt <- ordNub (concatMap Installed.frameworkDirs pkgs)
+          ]
+
         -- hsc2hs flag parsing was wrong
         -- (see -- https://github.com/haskell/hsc2hs/issues/35)
         -- so we need to put -- --cc/--ld *after* hsc2hsOptions,
