diff options
| author | Carter Tazio Schonwald <carter.schonwald@gmail.com> | 2014-07-02 08:52:53 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-07-02 08:52:53 -0500 |
| commit | 34f7e9a3c99850859901ca74370f55f1d4e2279a (patch) | |
| tree | e2aa7573d85337837c911f0a815c60570ed945df /compiler/main | |
| parent | 8afe616d52c652db249c4d00b24c82a35ca75068 (diff) | |
| download | haskell-34f7e9a3c99850859901ca74370f55f1d4e2279a.tar.gz | |
Control CPP through settings file (#8683)
Summary:
Allow the CPP program and flag choices for GHC
be configured via the the ghc settings file
Test Plan: ran validate yesterday
Reviewers: hvr, austin, mzero, simonmar
Reviewed By: austin, mzero, simonmar
Subscribers: mzero, simonmar, relrod, carter
Differential Revision: https://phabricator.haskell.org/D26
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/SysTools.lhs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index 51d5af137c..641b0cb12f 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -235,6 +235,8 @@ initSysTools mbMinusB -- to make that possible, so for now you can't. gcc_prog <- getSetting "C compiler command" gcc_args_str <- getSetting "C compiler flags" + cpp_prog <- getSetting "Haskell CPP command" + cpp_args_str <- getSetting "Haskell CPP flags" let unreg_gcc_args = if targetUnregisterised then ["-DNO_REGS", "-DUSE_MINIINTERPRETER"] else [] @@ -243,6 +245,7 @@ initSysTools mbMinusB | mkTablesNextToCode targetUnregisterised = ["-DTABLES_NEXT_TO_CODE"] | otherwise = [] + cpp_args= map Option (words cpp_args_str) gcc_args = map Option (words gcc_args_str ++ unreg_gcc_args ++ tntc_gcc_args) @@ -285,10 +288,7 @@ initSysTools mbMinusB -- cpp is derived from gcc on all platforms -- HACK, see setPgmP below. We keep 'words' here to remember to fix -- Config.hs one day. - let cpp_prog = gcc_prog - cpp_args = Option "-E" - : map Option (words cRAWCPP_FLAGS) - ++ gcc_args + -- Other things being equal, as and ld are simply gcc gcc_link_args_str <- getSetting "C compiler link flags" |