diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-04-26 05:37:17 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-04-26 05:37:17 -0400 |
| commit | 203a47a3451d6320fcba0613760a8787815a6246 (patch) | |
| tree | 25bcb108bff0186b095fb142560710b580e86399 /GNUmakefile | |
| parent | a0e21c77aeadb2d8bb4c03a830528c9ae0616dfe (diff) | |
| download | cryptopp-git-203a47a3451d6320fcba0613760a8787815a6246.tar.gz | |
Fix ARM A-32 and Aarch64 builds
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 3491ef4d..a572bc9d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -477,7 +477,7 @@ ifeq ($(DETECT_FEATURES),1) # Clang needs an option to include <arm_neon.h> TPROG = TestPrograms/test_arm_neon_header.cpp TOPT = -march=armv7-a -mfpu=neon - HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) + HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) ifeq ($(strip $(HAVE_OPT)),0) THEADER += -DCRYPTOPP_ARM_NEON_HEADER=1 endif @@ -523,14 +523,14 @@ ifeq ($(DETECT_FEATURES),1) TPROG = TestPrograms/test_arm_neon_header.cpp TOPT = - HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) + HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) ifeq ($(strip $(HAVE_OPT)),0) THEADER += -DCRYPTOPP_ARM_NEON_HEADER=1 endif TPROG = TestPrograms/test_arm_acle_header.cpp TOPT = -march=armv8-a - HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) + HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_ACLE_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) ifeq ($(strip $(HAVE_OPT)),0) THEADER += -DCRYPTOPP_ARM_ACLE_HEADER=1 endif |