diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2022-02-13 02:13:16 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2022-02-13 02:13:16 -0500 |
| commit | 2384c8ea1e51e396ae0bb993a1f5f599a6a3965c (patch) | |
| tree | cf372d1b1c1e5bff3be856195292dad61cbdb775 /GNUmakefile | |
| parent | e3fb5a9918a66c72f4258534a40b37c0bc5644fb (diff) | |
| download | cryptopp-git-2384c8ea1e51e396ae0bb993a1f5f599a6a3965c.tar.gz | |
Fix typos in Makefiles
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7557845c..6f1fba92 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1077,10 +1077,10 @@ endif # Valgrind # Debug testing on GNU systems. Triggered by -DDEBUG. # Newlib test due to http://sourceware.org/bugzilla/show_bug.cgi?id=20268 -ifneq ($(filter -DDEBUG -DDEBUG=1,$(CXXFLAGS)),) +ifneq ($(filter -DDEBUG -DDEBUG=1,$(CPPFLAGS)$(CXXFLAGS)),) TPROG = TestPrograms/test_cxx.cpp TOPT = - USING_GLIBCXX := $(shell $(CXX)$(CXXFLAGS) -E $(TPROG) -c 2>&1 | $(GREP) -i -c "__GLIBCXX__") + USING_GLIBCXX := $(shell $(CXX) $(CPPFLAGS) $(CXXFLAGS) -E $(TPROG) -c 2>&1 | $(GREP) -i -c "__GLIBCXX__") ifneq ($(USING_GLIBCXX),0) ifeq ($(HAS_NEWLIB),0) ifeq ($(findstring -D_GLIBCXX_DEBUG,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXFLAGS)),) @@ -1094,7 +1094,7 @@ ifneq ($(filter -DDEBUG -DDEBUG=1,$(CXXFLAGS)),) TOPT = -qheapdebug -qro HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) ifeq ($(strip $(HAVE_OPT)),0) - CRYPTOPP_CXXFLAGS += -qheapdebug -qro + CRYPTOPP_CXXFLAGS += -qheapdebug -qro endif # CRYPTOPP_CXXFLAGS endif # XLC_COMPILER endif # Debug build @@ -1176,14 +1176,14 @@ ifneq ($(IS_MINGW),0) INCL += resource.h endif -# Cryptogams source files. We couple to ARMv7 and NEON. +# Cryptogams source files. We couple to ARMv7 and NEON due to SHA using NEON. # 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)),) # 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__',) + ifeq ($(shell $(CXX) -dM -E TestPrograms/test_cxx.cpp 2>/dev/null | grep -E '__ARM_ARCH 7|__ARM_ARCH_7A__'),) CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a endif ifeq ($(CLANG_COMPILER),1) |