Clarify the "object splitting" variable names

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 77f673b..0def1c1 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -116,8 +116,8 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
        @echo 'cLdLinkerOpts         = words "$(CONF_LD_LINKER_OPTS_STAGE$*)"'  >> $@
        @echo 'cIntegerLibrary       :: String'                             >> $@
        @echo 'cIntegerLibrary       = "$(INTEGER_LIBRARY)"'                >> $@
        @echo 'cLdLinkerOpts         = words "$(CONF_LD_LINKER_OPTS_STAGE$*)"'  >> $@
        @echo 'cIntegerLibrary       :: String'                             >> $@
        @echo 'cIntegerLibrary       = "$(INTEGER_LIBRARY)"'                >> $@

-       @echo 'cSplitObjs            :: String'                             >> $@
-       @echo 'cSplitObjs            = "$(SupportsSplitObjs)"'              >> $@
+       @echo 'cSupportsSplitObjs    :: String'                             >> $@
+       @echo 'cSupportsSplitObjs    = "$(SupportsSplitObjs)"'              >> $@

        @echo 'cGhcWithInterpreter   :: String'                             >> $@
        @echo 'cGhcWithInterpreter   = "$(GhcWithInterpreter)"'             >> $@
        @echo 'cGhcWithNativeCodeGen :: String'                             >> $@
        @echo 'cGhcWithInterpreter   :: String'                             >> $@
        @echo 'cGhcWithInterpreter   = "$(GhcWithInterpreter)"'             >> $@
        @echo 'cGhcWithNativeCodeGen :: String'                             >> $@

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 7bd4d84..1317441 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2281,7 +2281,7 @@ picCCOpts _dflags
 -- Splitting
 
 can_split :: Bool
 -- Splitting
 
 can_split :: Bool

-can_split = cSplitObjs == "YES"
+can_split = cSupportsSplitObjs == "YES"

 
 -- -----------------------------------------------------------------------------
 -- Compiler Info
 
 -- -----------------------------------------------------------------------------
 -- Compiler Info

@@ -2298,7 +2298,7 @@ compilerInfo = [("Project name",                String cProjectName),
                 ("Host platform",               String cHostPlatformString),
                 ("Target platform",             String cTargetPlatformString),
                 ("Have interpreter",            String cGhcWithInterpreter),
                 ("Host platform",               String cHostPlatformString),
                 ("Target platform",             String cTargetPlatformString),
                 ("Have interpreter",            String cGhcWithInterpreter),

-                ("Object splitting",            String cSplitObjs),
+                ("Object splitting supported",  String cSupportsSplitObjs),

                 ("Have native code generator",  String cGhcWithNativeCodeGen),
                 ("Support SMP",                 String cGhcWithSMP),
                 ("Unregisterised",              String cGhcUnregisterised),
                 ("Have native code generator",  String cGhcWithNativeCodeGen),
                 ("Support SMP",                 String cGhcWithSMP),
                 ("Unregisterised",              String cGhcUnregisterised),