diff options
author | John Ericson <git@JohnEricson.me> | 2019-10-07 23:06:26 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-12 06:32:18 -0400 |
commit | c2290596f10ce732be85503d3ef0f0b50b7e925a (patch) | |
tree | 7206d141fd205c0c6fe6a0d54eb30f1171b23f06 /rts/ghc.mk | |
parent | 166e1c2adf73b69bfbbec81e98a78814a031ddc7 (diff) | |
download | haskell-c2290596f10ce732be85503d3ef0f0b50b7e925a.tar.gz |
Simplify Configure in a few ways
- No need to distinguish between gcc-llvm and clang. First of all,
gcc-llvm is quite old and surely unmaintained by now. Second of all,
none of the code actually care about that distinction!
Now, it does make sense to consider C multiple frontends for LLVMs in
the form of clang vs clang-cl (same clang, yes, but tweaked
interface). But this is better handled in terms of "gccish vs
mvscish" and "is LLVM", yielding 4 combinations. Therefore, I don't
think it is useful saving the existing code for that.
- Get the remaining CC_LLVM_BACKEND, and also TABLES_NEXT_TO_CODE in
mk/config.h the normal way, rather than hacking it post-hoc. No point
keeping these special cases around for now reason.
- Get rid of hand-rolled `die` function and just use `AC_MSG_ERROR`.
- Abstract check + flag override for unregisterised and tables next to
code.
Oh, and as part of the above I also renamed/combined some variables
where it felt appropriate.
- GccIsClang -> CcLlvmBackend. This is for `AC_SUBST`, like the other
Camal case ones. It was never about gcc-llvm, or Apple's renamed clang,
to be clear.
- llvm_CC_FLAVOR -> CC_LLVM_BACKEND. This is for `AC_DEFINE`, like the
other all-caps snake case ones. llvm_CC_FLAVOR was just silly
indirection *and* an odd name to boot.
Diffstat (limited to 'rts/ghc.mk')
-rw-r--r-- | rts/ghc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 26865b5bb7..c07cfaec86 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -523,7 +523,7 @@ rts/win32/ThrIOManager_CC_OPTS += -w # for details # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0) -ifneq "$(CC_CLANG_BACKEND)" "1" +ifneq "$(CcLlvmBackend)" "YES" rts/sm/Compact_CC_OPTS += -finline-limit=2500 endif |