Commit 8f2f7a09 authored by thoughtpolice's avatar thoughtpolice
Browse files

Add some missing clang bits to the build system.


Signed-off-by: thoughtpolice's avatarAustin Seipp <aseipp@pobox.com>
parent 6bd61397
...@@ -84,6 +84,11 @@ ifeq "$(CC_LLVM_BACKEND)" "1" ...@@ -84,6 +84,11 @@ ifeq "$(CC_LLVM_BACKEND)" "1"
@echo >> $@ @echo >> $@
@echo "#define llvm_CC_FLAVOR 1" >> $@ @echo "#define llvm_CC_FLAVOR 1" >> $@
endif endif
#
ifeq "$(CC_CLANG_BACKEND)" "1"
@echo >> $@
@echo "#define clang_CC_FLAVOR 1" >> $@
endif
# #
@echo "#endif /* __GHCAUTOCONF_H__ */" >> $@ @echo "#endif /* __GHCAUTOCONF_H__ */" >> $@
@echo "Done." @echo "Done."
......
...@@ -616,7 +616,12 @@ CPP = @CPP@ @CPPFLAGS@ ...@@ -616,7 +616,12 @@ CPP = @CPP@ @CPPFLAGS@
# RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to # RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
# behave plausibly on Haskell sources. # behave plausibly on Haskell sources.
# #
# Clang in particular is a bit more annoying, so we suppress some warnings.
RAWCPP_FLAGS = -undef -traditional RAWCPP_FLAGS = -undef -traditional
ifeq "$(CC_CLANG_BACKEND)" "1"
RAWCPP_FLAGS += -Wno-invalid-pp-token
endif
FIND = @FindCmd@ FIND = @FindCmd@
# #
......
...@@ -155,4 +155,5 @@ OSTYPE=@OSTYPE@ ...@@ -155,4 +155,5 @@ OSTYPE=@OSTYPE@
SOLARIS_BROKEN_SHLD=@SOLARIS_BROKEN_SHLD@ SOLARIS_BROKEN_SHLD=@SOLARIS_BROKEN_SHLD@
# Do we have a C compiler using an LLVM back end? # 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@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment