diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2022-02-10 22:45:43 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2022-02-10 22:45:43 -0500 |
| commit | a1d5313c7d15c889a9cb4f0cd2a0bbd9648a4735 (patch) | |
| tree | 3e5c29a04e9a4ddeebd9a3acd87a1935844022ff /GNUmakefile-cross | |
| parent | 56e5d5921d870c7f23ed717385bce3127056836f (diff) | |
| download | cryptopp-git-a1d5313c7d15c889a9cb4f0cd2a0bbd9648a4735.tar.gz | |
Use CRYPTOPP_CPPFLAGS in recipes that use CPPFLAGS
Diffstat (limited to 'GNUmakefile-cross')
| -rw-r--r-- | GNUmakefile-cross | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GNUmakefile-cross b/GNUmakefile-cross index e83c0baf..81329b34 100644 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -197,7 +197,7 @@ IS_PPC64 := 0 # Hack to skip CPU feature tests for some recipes DETECT_FEATURES ?= 1 -ifneq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CPPFLAGS)$(CXXFLAGS)),) +ifneq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CPPFLAGS)$(CXXFLAGS)h),) DETECT_FEATURES := 0 else ifneq ($(findstring clean,$(MAKECMDGOALS)),) DETECT_FEATURES := 0 @@ -703,7 +703,7 @@ INCL := $(filter-out resource.h,$(sort $(wildcard *.h))) # Limit to Linux. The source files target the GNU assembler. # Also see https://www.cryptopp.com/wiki/Cryptogams. ifeq ($(IS_ARM32)$(IS_LINUX),11) - ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXFLAGS)),) + ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CPPFLAGS)$(CXXFLAGS)),) # Do not use -march=armv7 if the compiler is already targeting the ISA. # Also see https://github.com/weidai11/cryptopp/issues/1094 ifeq ($(CXX) -dM -E TestPrograms/test_cxx.cpp 2>/dev/null | grep -E '__ARM_ARCH 7|__ARM_ARCH_7A__',) |