diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-09-04 15:29:03 +1000 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-09-04 15:29:03 +1000 |
| commit | fc4856f9e811d9a23ae9212f43a09ddf5ef12b26 (patch) | |
| tree | be25695f2b816016314e912f512a40d5cdf43c22 /mk | |
| parent | 62d3fdeb9edfcfdeb661a6b8551ac2fc45b8595c (diff) | |
| download | haskell-fc4856f9e811d9a23ae9212f43a09ddf5ef12b26.tar.gz | |
Make validate play nice with clang (for Xcode 5 command line tools)
* This partially fixes #8148. However, --with-ghc-4.8 will still not work given the rather dubious m4 macros and the failures in the test suite due to '-nodefaultlibs' still need to be fixed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 1 | ||||
| -rw-r--r-- | mk/validate-settings.mk | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 0c2003b680..6402ac5680 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -490,6 +490,7 @@ endif TargetPlatformFull = @TargetPlatformFull@ GccLT34 = @GccLT34@ GccLT46 = @GccLT46@ +GccIsClang = @GccIsClang@ CC = $(WhatGccIsCalled) CC_STAGE0 = @CC_STAGE0@ diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 9aa824d5bc..00ce02748e 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -10,6 +10,8 @@ HADDOCK_DOCS = YES ##################### # Warnings +ifeq "$(GccIsClang)" "NO" + # Debian doesn't turn -Werror=unused-but-set-variable on by default, so # we turn it on explicitly for consistency with other users ifeq "$(GccLT46)" "NO" @@ -18,6 +20,13 @@ SRC_CC_WARNING_OPTS += -Werror=unused-but-set-variable SRC_CC_WARNING_OPTS += -Wno-error=inline endif +else + +# Don't warn about unknown GCC pragmas when using clang +SRC_CC_WARNING_OPTS += -Wno-unknown-pragmas + +endif + SRC_CC_OPTS += $(WERROR) -Wall SRC_HC_OPTS += $(WERROR) -Wall |