diff options
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index f139b3d39..00778a8f5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -21,8 +21,11 @@ # Macros # +# allow user to override compiler +# if no compiler is specified make specifies cc +ifeq ($(CC),cc) CC = /usr/bin/g++ - +endif all: MCServer/MCServer @@ -82,6 +85,15 @@ endif endif +################################################### +# 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 +disableasm = 1 +endif + ################################################### # Set the link libraries based on the OS |