From 4c2df0fd2ada5f898332e9737627e2b550731dac Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Sep 2013 20:59:24 +0100 Subject: [PATCH 1/4] disable tautological compare in clang disable the tautological compare warning in clang as crypto++ triggers this warning and they are ignoring it --- GNUmakefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index 845aca3d9..a18e6a97f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -85,6 +85,13 @@ endif endif +################################################### +ifeq ($(CC),clang++) +CC_OPTIONS += -Wno-tautological-compare +endif +ifeq ($(CC),clang) +CC_OPTIONS += -Wno-tautological-compare +endif ################################################### # Set the link libraries based on the OS From e24d731419fa4abe21144ed7de46a057fe87b779 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Sep 2013 21:17:13 +0100 Subject: [PATCH 2/4] disable tautolgical compare warning in clang disable the tautological compare warning as it is triggered by crypto++ using unsigned ints in comparisons to zero in template code. crypto++ do not show any indication of fixing it. this commit does add a dependency on grep but that should not be a major problem --- GNUmakefile | 7 +++---- 1 file 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 From c7c18aa7e77f7184ab6fc9a6181dc57b6572a2ca Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Sep 2013 21:17:13 +0100 Subject: [PATCH 3/4] disable tautolgical compare warning in clang disable the tautological compare warning as it is triggered by crypto++ using unsigned ints in comparisons to zero in template code. crypto++ do not show any indication of fixing it. this commit does add a dependency on grep but that should not be a major problem --- GNUmakefile | 9 +++++---- 1 file 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 From 63ecdaa1f29def58f2d6d389b836570192fe6ab4 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Wed, 11 Sep 2013 17:27:30 +0100 Subject: [PATCH 4/4] added cryptopp asemblly desabling to clang autodetect --- GNUmakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/GNUmakefile b/GNUmakefile index a9216376a..00778a8f5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -91,6 +91,7 @@ endif 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