summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-09-10 22:17:13 +0200
committerTycho Bickerstaff <work.tycho@gmail.com>2013-09-10 22:17:13 +0200
commite24d731419fa4abe21144ed7de46a057fe87b779 (patch)
tree1bfdbe15c6da5371d8b6a616b7636ee70a1de15a
parentdisable tautological compare in clang (diff)
downloadcuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar.gz
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar.bz2
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar.lz
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar.xz
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.tar.zst
cuberite-e24d731419fa4abe21144ed7de46a057fe87b779.zip
Diffstat (limited to '')
-rw-r--r--GNUmakefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a18e6a97f..29af764f7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -86,12 +86,11 @@ endif
###################################################
-ifeq ($(CC),clang++)
+ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0)
CC_OPTIONS += -Wno-tautological-compare
+CXX_OPTIONS += -Wno-tautological-compare
endif
-ifeq ($(CC),clang)
-CC_OPTIONS += -Wno-tautological-compare
-endif
+
###################################################
# Set the link libraries based on the OS