summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-04 21:02:50 +0000
committerIan Lynagh <igloo@earth.li>2011-01-04 21:02:50 +0000
commit157964f0700f510c75bc10f3ebfc5cfce95b8227 (patch)
treeba9a3b3180a14cf5157cbb58668593967fdbc158
parent834a2186da7f4ea29d4984a5f809183cb299754a (diff)
downloadhaskell-157964f0700f510c75bc10f3ebfc5cfce95b8227.tar.gz
Rename the c*Platform variables to c*PlatformString
-rw-r--r--compiler/ghc.mk12
-rw-r--r--compiler/main/DynFlags.hs6
2 files changed, 9 insertions, 9 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index fb09a3382b..44ac382f54 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -51,12 +51,12 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
@echo >> $@
@echo '#include "ghc_boot_platform.h"' >> $@
@echo >> $@
- @echo 'cBuildPlatform :: String' >> $@
- @echo 'cBuildPlatform = BuildPlatform_NAME' >> $@
- @echo 'cHostPlatform :: String' >> $@
- @echo 'cHostPlatform = HostPlatform_NAME' >> $@
- @echo 'cTargetPlatform :: String' >> $@
- @echo 'cTargetPlatform = TargetPlatform_NAME' >> $@
+ @echo 'cBuildPlatformString :: String' >> $@
+ @echo 'cBuildPlatformString = BuildPlatform_NAME' >> $@
+ @echo 'cHostPlatformString :: String' >> $@
+ @echo 'cHostPlatformString = HostPlatform_NAME' >> $@
+ @echo 'cTargetPlatformString :: String' >> $@
+ @echo 'cTargetPlatformString = TargetPlatform_NAME' >> $@
@echo >> $@
@echo 'cProjectName :: String' >> $@
@echo 'cProjectName = "$(ProjectName)"' >> $@
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 7d77fb54e7..92b98ac1dd 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2283,9 +2283,9 @@ compilerInfo = [("Project name", String cProjectName),
("Project version", String cProjectVersion),
("Booter version", String cBooterVersion),
("Stage", String cStage),
- ("Build platform", String cBuildPlatform),
- ("Host platform", String cHostPlatform),
- ("Target platform", String cTargetPlatform),
+ ("Build platform", String cBuildPlatformString),
+ ("Host platform", String cHostPlatformString),
+ ("Target platform", String cTargetPlatformString),
("Have interpreter", String cGhcWithInterpreter),
("Object splitting", String cSplitObjs),
("Have native code generator", String cGhcWithNativeCodeGen),