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:27:52 +0200
commitc7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca (patch)
tree2fa9bd43601d6bdd61b24c43c1ef25ffb9dfb4db
parentdisable tautological compare in clang (diff)
downloadcuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar.gz
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar.bz2
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar.lz
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar.xz
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.tar.zst
cuberite-c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca.zip
Diffstat (limited to '')
-rw-r--r--GNUmakefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a18e6a97f..a9216376a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -86,12 +86,13 @@ endif
###################################################
-ifeq ($(CC),clang++)
+# Fix Crypto++ warnings in 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