diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-15 18:05:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 18:05:54 -0400 |
| commit | ba517a6c318c91e8aaf0fc15592796b4317bfe09 (patch) | |
| tree | ea28f6441ac128b98aa0bb78da5c3ad498285305 /GNUmakefile | |
| parent | c331fc9bc7178d211e4494cbc842b5598148b2ba (diff) | |
| download | cryptopp-git-ba517a6c318c91e8aaf0fc15592796b4317bfe09.tar.gz | |
Fix setenv-android.sh and cryptest-android.sh for NDK r19 (PR #893)
setenv-android.sh and cryptest-android.sh are up to date for NDK r19 again.
Diffstat (limited to 'GNUmakefile')
| -rwxr-xr-x | GNUmakefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile index 8b3a539f..8ad4532b 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -405,6 +405,15 @@ ifeq ($(DETECT_FEATURES),1) endif endif + # Most Clang cannot handle mixed asm with positional arguments, where the + # body is Intel style with no prefix and the templates are AT&T style. + # Also see https://bugs.llvm.org/show_bug.cgi?id=39895 . + TPROG = TestPrograms/test_mixed_asm.cxx + HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) + ifneq ($(strip $(HAVE_OPT)),0) + CXXFLAGS += -DCRYPTOPP_DISABLE_MIXED_ASM + endif + # DETECT_FEATURES endif @@ -428,15 +437,6 @@ ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),) endif endif -# Most Clang cannot handle mixed asm with positional arguments, where the -# body is Intel style with no prefix and the templates are AT&T style. -# Also see https://bugs.llvm.org/show_bug.cgi?id=39895 . -TPROG = TestPrograms/test_mixed_asm.cxx -HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) -ifneq ($(strip $(HAVE_OPT)),0) - CXXFLAGS += -DCRYPTOPP_DISABLE_MIXED_ASM -endif - # IS_X86, IS_X32 and IS_X64 endif |