Work around Issue 212 until we find a more permanent solution
parent
20c3e1a5ef
commit
739c8e5c14
|
|
@ -136,6 +136,7 @@ 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"}' )
|
||||
|
||||
|
|
@ -265,6 +266,11 @@ 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue