diff options
| author | Cheng Shao <astrohavoc@gmail.com> | 2022-08-23 14:45:58 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-24 02:37:38 -0400 |
| commit | 112e4f9c9c299b460e37a60d8f8d8693aa6ab06a (patch) | |
| tree | db6ee207178d4fd6de35c5f410ae2f9e5c7fa547 | |
| parent | b929063ec5473fc36fe3976ff0eb8064a2d2fc3d (diff) | |
| download | haskell-112e4f9c9c299b460e37a60d8f8d8693aa6ab06a.tar.gz | |
driver: don't actually merge objects when ar -L works
| -rw-r--r-- | compiler/GHC/Driver/Pipeline/Execute.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs index 08df732873..f19cb05ab5 100644 --- a/compiler/GHC/Driver/Pipeline/Execute.hs +++ b/compiler/GHC/Driver/Pipeline/Execute.hs @@ -1180,7 +1180,7 @@ via gcc. -- | See Note [Object merging]. joinObjectFiles :: HscEnv -> [FilePath] -> FilePath -> IO () joinObjectFiles hsc_env o_files output_fn - | can_merge_objs = do + | can_merge_objs && not dashLSupported = do let toolSettings' = toolSettings dflags ldIsGnuLd = toolSettings_ldIsGnuLd toolSettings' ld_r args = GHC.SysTools.runMergeObjects (hsc_logger hsc_env) (hsc_tmpfs hsc_env) (hsc_dflags hsc_env) ( |