From 157964f0700f510c75bc10f3ebfc5cfce95b8227 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 4 Jan 2011 21:02:50 +0000 Subject: [PATCH] Rename the c*Platform variables to c*PlatformString --- compiler/ghc.mk | 12 ++++++------ compiler/main/DynFlags.hs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index fb09a33..44ac382 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 7d77fb5..92b98ac 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), -- 1.7.10.4