diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2012-02-29 22:58:51 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2012-02-29 22:58:51 +0000 |
| commit | dfbaea8347907381409d72496449fdb53a823551 (patch) | |
| tree | 2af64063549570e0a548bdc894aa9b6e2f75ee88 /share | |
| parent | 6b9597aac404104039c95f4fab7201d727338702 (diff) | |
| download | src-test2-dfbaea8347907381409d72496449fdb53a823551.tar.gz src-test2-dfbaea8347907381409d72496449fdb53a823551.zip | |
Notes
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.own.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.sys.mk | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7ecb634aa6e3..fc214b588efc 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -419,6 +419,7 @@ __DEFAULT_NO_OPTIONS = \ BIND_SIGCHASE \ BIND_XML \ CLANG_EXTRAS \ + CLANG_IS_CC \ CTF \ HESIOD \ ICONV \ @@ -574,6 +575,10 @@ MK_GCC:= no MK_GDB:= no .endif +.if ${MK_CLANG} == "no" +MK_CLANG_IS_CC:= no +.endif + # # Set defaults for the MK_*_SUPPORT variables. # diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9b56154a369c..401e671f22d5 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -28,7 +28,7 @@ CFLAGS += -std=${CSTD} . if defined(WARNS) . if ${WARNS} >= 1 CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif @@ -42,7 +42,7 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) && (${CC:T:Mclang} != "clang" || !defined(NO_WCAST_ALIGN.clang)) +. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) CWARNFLAGS += -Wcast-align . endif . endif @@ -59,7 +59,7 @@ CWARNFLAGS += -Wno-uninitialized CWARNFLAGS += -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -. if ${CC:T:Mclang} == "clang" +. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" . if ${WARNS} <= 3 CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\ -Wno-parentheses-equality -Wno-unused-function\ @@ -84,12 +84,12 @@ WFORMAT = 1 . if ${WFORMAT} > 0 #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif . endif -. if defined(NO_WFORMAT) || (${CC:T:Mclang} == "clang" && defined(NO_WFORMAT.clang)) +. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) CWARNFLAGS += -Wno-format . endif .endif @@ -98,7 +98,7 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${CC:T:Mclang} == "clang" +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" CLANG_NO_IAS = -no-integrated-as CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ -mllvm -enable-load-pre=false |