arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge remote-tracking branch 'upstream/master'" - shouldn't be merged by me 

This reverts commit a424635a14, reversing
changes made to 1cf48cf97b.
pull/215/merge
Mouse 2016-07-06 12:11:41 -04:00
parent 87be783cd1
commit fd1a8830d3
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cryptest.sh
View File

@ -136,7 +136,6 @@ fi
# Now that the compiler is fixed, see if its GCC 5.1 or above with -Wabi, -Wabi-tag and -Wodr
GCC_51_OR_ABOVE=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version (5\.[1-9]|[6-9])')
GCC_48_COMPILER=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version 4\.8')
# SunCC 12.2 and below needs one set of CXXFLAGS; SunCC 12.3 and above needs another set of CXXFLAGS
SUNCC_123_OR_ABOVE=$("$CXX" -E -xdumpmacros /dev/null 2>&1 | "$GREP" " __SUNPRO_CC " 2>/dev/null | "$AWK" '{print ($2 >= 0x5120) ? "1" : "0"}' )
@ -290,11 +289,6 @@ if [[ (-z "$HAVE_ASAN") ]]; then
fi
fi
# Fixup; see http://github.com/weidai11/cryptopp/issues/212
if [[ ("$GCC_48_COMPILER" -ne "0" && "$IS_ARM32" -ne "0") ]]; then
HAVE_ASAN=0
fi
# Darwin and Intel multiarch
if [[ (-z "$HAVE_INTEL_MULTIARCH") ]]; then
HAVE_INTEL_MULTIARCH=0