summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2013-06-17 04:57:18 -0500
committerAustin Seipp <aseipp@pobox.com>2013-06-17 05:54:33 -0500
commit8f2f7a094deb8e77560697181636234f1590f485 (patch)
treebda5bd402f7ff61287055159c5eb4b6ba0b90481 /mk
parent6bd6139730b0f7889ca3773ec5139470398c906e (diff)
downloadhaskell-8f2f7a094deb8e77560697181636234f1590f485.tar.gz
Add some missing clang bits to the build system.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in5
-rw-r--r--mk/project.mk.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9a6ab56c3c..a65dc69b57 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -616,7 +616,12 @@ CPP = @CPP@ @CPPFLAGS@
# RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
# behave plausibly on Haskell sources.
#
+# Clang in particular is a bit more annoying, so we suppress some warnings.
RAWCPP_FLAGS = -undef -traditional
+ifeq "$(CC_CLANG_BACKEND)" "1"
+RAWCPP_FLAGS += -Wno-invalid-pp-token
+endif
+
FIND = @FindCmd@
#
diff --git a/mk/project.mk.in b/mk/project.mk.in
index 004e9b1c15..7b25368b38 100644
--- a/mk/project.mk.in
+++ b/mk/project.mk.in
@@ -155,4 +155,5 @@ OSTYPE=@OSTYPE@
SOLARIS_BROKEN_SHLD=@SOLARIS_BROKEN_SHLD@
# Do we have a C compiler using an LLVM back end?
-CC_LLVM_BACKEND = @CC_LLVM_BACKEND@
+CC_LLVM_BACKEND = @CC_LLVM_BACKEND@
+CC_CLANG_BACKEND = @CC_CLANG_BACKEND@