From 43de737624ceeb1c41012d2ea4f0d5dcba8a19e5 Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Fri, 3 Feb 2023 22:02:44 +0100 Subject: [PATCH] libcryfs: Fix Crypto++ build --- .../vendor_cryptopp/TestScripts/setenv-android.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/cryptopp/vendor_cryptopp/TestScripts/setenv-android.sh b/vendor/cryptopp/vendor_cryptopp/TestScripts/setenv-android.sh index f265fc57..83075b11 100755 --- a/vendor/cryptopp/vendor_cryptopp/TestScripts/setenv-android.sh +++ b/vendor/cryptopp/vendor_cryptopp/TestScripts/setenv-android.sh @@ -240,12 +240,12 @@ case "$ANDROID_CPU" in # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" ANDROID_CFLAGS="-target i686-none-linux-android${ANDROID_API}" - ANDROID_CFLAGS="${ANDROID_CFLAGS} -mtune=intel -mssse3 -mfpmath=sse" + ANDROID_CFLAGS="${ANDROID_CFLAGS} -mssse3 -mfpmath=sse" ANDROID_CFLAGS="${ANDROID_CFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti" ANDROID_CFLAGS="${ANDROID_CFLAGS} -fno-addrsig -fno-experimental-isel" ANDROID_CXXFLAGS="-target i686-none-linux-android${ANDROID_API}" - ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -mtune=intel -mssse3 -mfpmath=sse" + ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -mssse3 -mfpmath=sse" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -std=c++11 -stdlib=libc++" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fno-addrsig -fno-experimental-isel" @@ -261,12 +261,12 @@ case "$ANDROID_CPU" in # ANDROID_CPPFLAGS="-D__ANDROID__=${ANDROID_API}" ANDROID_CFLAGS="-target x86_64-none-linux-android${ANDROID_API}" - ANDROID_CFLAGS="${ANDROID_CFLAGS} -march=x86-64 -msse4.2 -mpopcnt -mtune=intel" + ANDROID_CFLAGS="${ANDROID_CFLAGS} -march=x86-64 -msse4.2 -mpopcnt" ANDROID_CFLAGS="${ANDROID_CFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti" ANDROID_CFLAGS="${ANDROID_CFLAGS} -fno-addrsig -fno-experimental-isel" ANDROID_CXXFLAGS="-target x86_64-none-linux-android${ANDROID_API}" - ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -march=x86-64 -msse4.2 -mpopcnt -mtune=intel" + ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -march=x86-64 -msse4.2 -mpopcnt" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -std=c++11 -stdlib=libc++" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fstack-protector-strong -funwind-tables -fexceptions -frtti" ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -fno-addrsig -fno-experimental-isel"