diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-24 23:31:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-24 23:31:21 +0000 |
| commit | 001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e (patch) | |
| tree | 303f900a56d5f00b6e4eaba44a75a49796905813 /compiler | |
| parent | 77b29b5685db2f8745d191af1599ed753bef91e7 (diff) | |
| download | haskell-001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e.tar.gz | |
Keep separate linker flags, for when we want to link with gcc or ld
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.mk | 6 | ||||
| -rw-r--r-- | compiler/main/DynFlags.hs | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index c601f29942..77f673bc8b 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -110,8 +110,10 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. @echo 'cStage = show (STAGE :: Int)' >> $@ @echo 'cCcOpts :: [String]' >> $@ @echo 'cCcOpts = words "$(CONF_CC_OPTS_STAGE$*)"' >> $@ - @echo 'cLdOpts :: [String]' >> $@ - @echo 'cLdOpts = words "$(CONF_LD_OPTS_STAGE$*)"' >> $@ + @echo 'cGccLinkerOpts :: [String]' >> $@ + @echo 'cGccLinkerOpts = words "$(CONF_GCC_LINKER_OPTS_STAGE$*)"' >> $@ + @echo 'cLdLinkerOpts :: [String]' >> $@ + @echo 'cLdLinkerOpts = words "$(CONF_LD_LINKER_OPTS_STAGE$*)"' >> $@ @echo 'cIntegerLibrary :: String' >> $@ @echo 'cIntegerLibrary = "$(INTEGER_LIBRARY)"' >> $@ @echo 'cSplitObjs :: String' >> $@ diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 854b83af4d..17b8fdb8b7 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2296,6 +2296,7 @@ compilerInfo = [("Project name", String cProjectName), ("LibDir", FromDynFlags topDir), ("Global Package DB", FromDynFlags systemPackageConfig), ("C compiler flags", String (show cCcOpts)), - ("Linker flags", String (show cLdOpts)) + ("Gcc Linker flags", String (show cGccLinkerOpts)), + ("Ld Linker flags", String (show cLdLinkerOpts)) ] |