summaryrefslogtreecommitdiff
path: root/compiler/main/SysTools.hs
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-04-07 22:33:21 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-07-14 01:21:11 -0400
commite7ed53c9c347bbf6650f268b516da6e6c156a91a (patch)
tree16d6f1ed782965a11ff98bbda8aa0674fe8521c7 /compiler/main/SysTools.hs
parentf508b7ce56f1e7dc2666de3139f58c02a0567461 (diff)
downloadhaskell-e7ed53c9c347bbf6650f268b516da6e6c156a91a.tar.gz
Remove LLVM_TARGET platform macros
Instead following @angerman's suggestion put them in the config file. Maybe we could re-key llvm-targets someday, but this is good for now.
Diffstat (limited to 'compiler/main/SysTools.hs')
-rw-r--r--compiler/main/SysTools.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 518d9fdb2f..bfaa6562cc 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -236,6 +236,8 @@ initSysTools top_dir
ld_prog = cc_prog
ld_args = map Option (cc_args ++ words cc_link_args_str)
+ llvmTarget <- getSetting "LLVM target"
+
-- We just assume on command line
lc_prog <- getSetting "LLVM llc command"
lo_prog <- getSetting "LLVM opt command"
@@ -336,6 +338,7 @@ initSysTools top_dir
, platformMisc_ghcThreaded = ghcThreaded
, platformMisc_ghcDebugged = ghcDebugged
, platformMisc_ghcRtsWithLibdw = ghcRtsWithLibdw
+ , platformMisc_llvmTarget = llvmTarget
}
, sPlatformConstants = platformConstants