diff options
| author | John Ericson <git@JohnEricson.me> | 2019-03-26 23:48:47 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-08 15:53:40 -0400 |
| commit | 93f34bbd3319544d8eb3a5e2593bccb9b12e3459 (patch) | |
| tree | 4cd60b1595e767398f3b0fb17585f08918d1119a /compiler/main | |
| parent | 4c86187ccd49309c1d6b32d05b164822a803d3e2 (diff) | |
| download | haskell-93f34bbd3319544d8eb3a5e2593bccb9b12e3459.tar.gz | |
Purge TargetPlatform_NAME and cTargetPlatformString
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 3 | ||||
| -rw-r--r-- | compiler/main/SysTools.hs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 1a62d9b15f..ece0c2208e 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1357,6 +1357,7 @@ data Settings = Settings { sPlatformConstants :: PlatformConstants, -- Formerly Config.hs, target specific + sTargetPlatformString :: String, -- TODO Recalculate string from richer info? sTablesNextToCode :: Bool } @@ -5621,7 +5622,7 @@ compilerInfo dflags ("Stage", cStage), ("Build platform", cBuildPlatformString), ("Host platform", cHostPlatformString), - ("Target platform", cTargetPlatformString), + ("Target platform", sTargetPlatformString $ settings dflags), ("Have interpreter", cGhcWithInterpreter), ("Object splitting supported", showBool False), ("Have native code generator", cGhcWithNativeCodeGen), diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 4374c35dcf..50cc6d58e5 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -177,6 +177,7 @@ initSysTools top_dir Nothing -> pgmError ("Failed to read " ++ show key ++ " value " ++ show xs) Nothing -> pgmError ("No entry for " ++ show key ++ " in " ++ show settingsFile) crossCompiling <- getBooleanSetting "cross compiling" + targetPlatformString <- getSetting "target platform string" targetArch <- readSetting "target arch" targetOS <- readSetting "target os" targetWordSize <- readSetting "target word size" @@ -305,6 +306,7 @@ initSysTools top_dir sOpt_lc = [], sOpt_i = [], sPlatformConstants = platformConstants, + sTargetPlatformString = targetPlatformString, sTablesNextToCode = tablesNextToCode } |