From b784852998810c50d86bbe6f1bff95f65ebcdbbe Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 17 Apr 2017 00:20:22 -0400 Subject: [PATCH] Add no-asm target to ease testing of -DCRYPTOPP_DISABLE_ASM This is intended to be used on Travis CI --- GNUmakefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index bdfdaf0f..db1713f6 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -360,6 +360,13 @@ ARFLAGS = -xar -o RANLIB = true endif +# No ASM for Travis testing +ifeq ($(findstring no-asm,$(MAKECMDGOALS)),no-asm) +ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),) +CXXFLAGS += -DCRYPTOPP_DISABLE_ASM +endif # CXXFLAGS +endif # No ASM + # Undefined Behavior Sanitizer (UBsan) testing. There's no sense in # allowing unaligned data access. There will too many findings. ifeq ($(findstring ubsan,$(MAKECMDGOALS)),ubsan) @@ -515,8 +522,8 @@ deps GNUmakefile.deps: $(CXX) $(strip $(CXXFLAGS)) -MM *.cpp > GNUmakefile.deps # CXXFLAGS are tuned earlier. -.PHONY: asan ubsan -asan ubsan: libcryptopp.a cryptest.exe +.PHONY: asan ubsan no-asm +no-asm asan ubsan: libcryptopp.a cryptest.exe # CXXFLAGS are tuned earlier. Applications must use linker flags # -Wl,--gc-sections (Linux and Unix) or -Wl,-dead_strip (OS X)