diff options
author | Jeffrey Walton <noloader@gmail.com> | 2021-02-14 06:18:32 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2021-02-14 06:18:32 -0500 |
commit | a9828d10edb04cf4602635e2608f927c702e126f (patch) | |
tree | 6957e30c1aa62f72da65a6da05cffcda7b2496f0 | |
parent | bf49953b11b3d8807f793bf72e7653f6b9afa2eb (diff) | |
download | cryptopp-git-a9828d10edb04cf4602635e2608f927c702e126f.tar.gz |
Add -fstack-protector-strong for Android builds
This is a standard flag for NDK builds
-rwxr-xr-x | TestScripts/setenv-android.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index 10142e8b..20657891 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -159,7 +159,7 @@ THE_ARCH=$(tr '[:upper:]' '[:lower:]' <<< "${ANDROID_CPU}") # https://developer.android.com/ndk/guides/abis.html and # https://developer.android.com/ndk/guides/cpp-support. # Since NDK r18 the only STL available is libc++, so we -# add -stdlib-libc++ to CXXFLAGS. This is consistent with +# add -stdlib=libc++ to CXXFLAGS. This is consistent with # Android.mk and 'APP_STL := c++_shared'. case "$THE_ARCH" in armv7*|armeabi*) @@ -172,7 +172,7 @@ case "$THE_ARCH" in STRIP="arm-linux-androideabi-strip" # Android NDK r19 and r20 no longer use -mfloat-abi=softfp. Add it as required. - ANDROID_CXXFLAGS="-march=armv7-a -mthumb -funwind-tables -stdlib=libc++ -fexceptions -frtti" + ANDROID_CXXFLAGS="-march=armv7-a -mthumb -fstack-protector-strong -funwind-tables -stdlib=libc++ -fexceptions -frtti" ;; armv8*|aarch64|arm64*) CC="aarch64-linux-android${ANDROID_API}-clang" @@ -183,7 +183,7 @@ case "$THE_ARCH" in RANLIB="aarch64-linux-android-ranlib" STRIP="aarch64-linux-android-strip" - ANDROID_CXXFLAGS="-funwind-tables -stdlib=libc++ -fexceptions -frtti" + ANDROID_CXXFLAGS="-funwind-tables -fstack-protector-strong -stdlib=libc++ -fexceptions -frtti" ;; i686|x86) CC="i686-linux-android${ANDROID_API}-clang" @@ -194,7 +194,7 @@ case "$THE_ARCH" in RANLIB="i686-linux-android-ranlib" STRIP="i686-linux-android-strip" - ANDROID_CXXFLAGS="-mtune=intel -mssse3 -mfpmath=sse -funwind-tables -stdlib=libc++ -fexceptions -frtti" + ANDROID_CXXFLAGS="-mtune=intel -mssse3 -mfpmath=sse -fstack-protector-strong -funwind-tables -stdlib=libc++ -fexceptions -frtti" ;; x86_64|x64) CC="x86_64-linux-android${ANDROID_API}-clang" @@ -205,7 +205,7 @@ case "$THE_ARCH" in RANLIB="x86_64-linux-android-ranlib" STRIP="x86_64-linux-android-strip" - ANDROID_CXXFLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -funwind-tables -stdlib=libc++ -fexceptions -frtti" + ANDROID_CXXFLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -fstack-protector-strong -funwind-tables -stdlib=libc++ -fexceptions -frtti" ;; *) echo "ERROR: Unknown architecture ${ANDROID_CPU}" |