diff options
| author | mrkun <mrgutkun@gmail.com> | 2022-11-29 17:52:05 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-12-06 15:46:38 -0500 |
| commit | 21d66db13291b09ca9a7c3d1a6ca64bdc7fd1a7a (patch) | |
| tree | 5260af883b79fb61e459fe5136f8e2d32a91d16a | |
| parent | cd31acad391582dd16b00a823271b364ab063ca9 (diff) | |
| download | haskell-21d66db13291b09ca9a7c3d1a6ca64bdc7fd1a7a.tar.gz | |
Push DynFlags out of runInstallNameTool
| -rw-r--r-- | compiler/GHC/Driver/Session.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Linker/MacOS.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/SysTools/Tasks.hs | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 865f1a528d..91157e9efa 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -130,7 +130,7 @@ module GHC.Driver.Session ( versionedAppDir, versionedFilePath, extraGccViaCFlags, globalPackageDatabasePath, pgm_L, pgm_P, pgm_F, pgm_c, pgm_cxx, pgm_a, pgm_l, pgm_lm, pgm_dll, pgm_T, - pgm_windres, pgm_ar, pgm_otool, pgm_install_name_tool, + pgm_windres, pgm_ar, pgm_otool, pgm_ranlib, pgm_lo, pgm_lc, pgm_lcc, pgm_i, opt_L, opt_P, opt_F, opt_c, opt_cxx, opt_a, opt_l, opt_lm, opt_i, opt_P_signature, @@ -835,8 +835,6 @@ pgm_ar :: DynFlags -> String pgm_ar dflags = toolSettings_pgm_ar $ toolSettings dflags pgm_otool :: DynFlags -> String pgm_otool dflags = toolSettings_pgm_otool $ toolSettings dflags -pgm_install_name_tool :: DynFlags -> String -pgm_install_name_tool dflags = toolSettings_pgm_install_name_tool $ toolSettings dflags pgm_ranlib :: DynFlags -> String pgm_ranlib dflags = toolSettings_pgm_ranlib $ toolSettings dflags pgm_lo :: DynFlags -> (String,[Option]) diff --git a/compiler/GHC/Linker/MacOS.hs b/compiler/GHC/Linker/MacOS.hs index 8b46ffd96c..b9123895e4 100644 --- a/compiler/GHC/Linker/MacOS.hs +++ b/compiler/GHC/Linker/MacOS.hs @@ -62,7 +62,7 @@ runInjectRPaths logger dflags lib_paths dylib = do -- inject the rpaths case rpaths of [] -> return () - _ -> runInstallNameTool logger dflags $ map Option $ "-add_rpath":(intersperse "-add_rpath" rpaths) ++ [dylib] + _ -> runInstallNameTool logger (toolSettings dflags) $ map Option $ "-add_rpath":(intersperse "-add_rpath" rpaths) ++ [dylib] get_rpath :: String -> Maybe FilePath get_rpath l = case readP_to_S rpath_parser l of diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs index 465b86a181..0cfa5fee7d 100644 --- a/compiler/GHC/SysTools/Tasks.hs +++ b/compiler/GHC/SysTools/Tasks.hs @@ -16,6 +16,8 @@ import GHC.IO (catchException) import GHC.CmmToLlvm.Config (LlvmVersion, llvmVersionStr, supportedLlvmVersionUpperBound, parseLlvmVersion, supportedLlvmVersionLowerBound) +import GHC.Settings + import GHC.SysTools.Process import GHC.SysTools.Info @@ -368,9 +370,9 @@ askOtool logger dflags mb_cwd args = do runSomethingWith logger "otool" otool args $ \real_args -> readCreateProcessWithExitCode' (proc otool real_args){ cwd = mb_cwd } -runInstallNameTool :: Logger -> DynFlags -> [Option] -> IO () -runInstallNameTool logger dflags args = do - let tool = pgm_install_name_tool dflags +runInstallNameTool :: Logger -> ToolSettings -> [Option] -> IO () +runInstallNameTool logger toolSettings args = do + let tool = toolSettings_pgm_install_name_tool toolSettings runSomethingFiltered logger id "Install Name Tool" tool args Nothing Nothing runRanlib :: Logger -> DynFlags -> [Option] -> IO () |