Rename the c*Platform variables to c*PlatformString

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index fb09a33..44ac382 100644 (file)
--- 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                                                               >> $@
        @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)"'                    >> $@
        @echo                                                               >> $@
        @echo 'cProjectName          :: String'                             >> $@
        @echo 'cProjectName          = "$(ProjectName)"'                    >> $@

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 7d77fb5..92b98ac 100644 (file)
--- 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),
                 ("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),
                 ("Have interpreter",            String cGhcWithInterpreter),
                 ("Object splitting",            String cSplitObjs),
                 ("Have native code generator",  String cGhcWithNativeCodeGen),