Add ASFLAGS to setenv-android.sh

2 files changed, 29 insertions, 21 deletions

diff --git a/TestScripts/cryptdll-windows.cmd b/TestScripts/cryptdll-windows.cmd
index eb626242..fadfd638 100755
--- a/TestScripts/cryptdll-windows.cmd
+++ b/TestScripts/cryptdll-windows.cmd
@@ -1,18 +1,18 @@
-REM  cryptdll-windows.cmd - written and placed in public domain by Jeffrey Walton
-REM                         Copyright assigned to the Crypto++ project.
-REM
-REM  For details see https://cryptopp.com/wiki/MSBuild_(Command_Line)
-REM
-
-REM  Build the Win32/Debug cryptest.exe
-msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptlib.vcxproj
-msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptest.vcxproj
-
-REM  Build the Win32/Release cryptopp.dll
-msbuild /t:Build /p:Configuration=Release;Platform=Win32 cryptdll.vcxproj
-
-REM  Build the FIPS test driver
-msbuild /t:Build /p:Configuration=Release;Platform=Win32 dlltest.vcxproj
-
-REM  Run the FIPS test driver
-.\Win32\DLL_Output\Release\dlltest.exe
+REM  cryptdll-windows.cmd - written and placed in public domain by Jeffrey Walton

+REM                         Copyright assigned to the Crypto++ project.

+REM

+REM  For details see https://cryptopp.com/wiki/MSBuild_(Command_Line)

+REM

+

+REM  Build the Win32/Debug cryptest.exe

+msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptlib.vcxproj

+msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptest.vcxproj

+

+REM  Build the Win32/Release cryptopp.dll

+msbuild /t:Build /p:Configuration=Release;Platform=Win32 cryptdll.vcxproj

+

+REM  Build the FIPS test driver

+msbuild /t:Build /p:Configuration=Release;Platform=Win32 dlltest.vcxproj

+

+REM  Run the FIPS test driver

+.\Win32\DLL_Output\Release\dlltest.exe

diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh
index 4e9b9630..dc83a64c 100755
--- a/TestScripts/setenv-android.sh
+++ b/TestScripts/setenv-android.sh
@@ -72,6 +72,7 @@ fi
 DEF_CPPFLAGS="-DNDEBUG"
 DEF_CFLAGS="-Wall -g2 -O3 -fPIC"
 DEF_CXXFLAGS="-Wall -g2 -O3 -fPIC"
+DEF_ASFLAGS=
 DEF_LDFLAGS=""
 
 #########################################
@@ -86,6 +87,7 @@ unset IS_ARM_EMBEDDED
 unset ANDROID_CPPFLAGS
 unset ANDROID_CFLAGS
 unset ANDROID_CXXFLAGS
+unset ANDROID_ASFLAGS
 unset ANDROID_LDFLAGS
 unset ANDROID_SYSROOT
 
@@ -308,7 +310,8 @@ echo "Configuring for Android API ${ANDROID_API} ($ANDROID_CPU)"
 # Common to all builds
 
 ANDROID_CPPFLAGS="${DEF_CPPFLAGS} ${ANDROID_CPPFLAGS} -DANDROID"
-ANDROID_CFLAGS="${DEF_CFLAGS} ${ANDROID_CFLAGS} -Wa,--noexecstack"
+ANDROID_ASFLAGS="${DEF_ASFLAGS} -Wa,--noexecstack"
+ANDROID_CFLAGS="${DEF_CFLAGS} ${ANDROID_CFLAGS}"
 ANDROID_CXXFLAGS="${DEF_CXXFLAGS} ${ANDROID_CXXFLAGS} -Wa,--noexecstack"
 ANDROID_LDFLAGS="${DEF_LDFLAGS}"
 
@@ -408,7 +411,10 @@ if [ "$VERBOSE" -gt 0 ]; then
   fi
   echo "ANDROID_CFLAGS: ${ANDROID_CFLAGS}"
   echo "ANDROID_CXXFLAGS: ${ANDROID_CXXFLAGS}"
-  if [ -n "${ANDROID_LDFLAGS}" ]; then
+  if [ -n "${ANDROID_ASFLAGS}" ]; then
+    echo "ANDROID_ASFLAGS: ${ANDROID_ASFLAGS}"
+  fi
+    if [ -n "${ANDROID_LDFLAGS}" ]; then
     echo "ANDROID_LDFLAGS: ${ANDROID_LDFLAGS}"
   fi
   echo "ANDROID_SYSROOT: ${ANDROID_SYSROOT}"
@@ -432,15 +438,17 @@ export CPP CC CXX LD AS AR RANLIB STRIP OBJDUMP
 CPPFLAGS="${ANDROID_CPPFLAGS} -isysroot ${ANDROID_SYSROOT}"
 CFLAGS="${ANDROID_CFLAGS}"
 CXXFLAGS="${ANDROID_CXXFLAGS}"
+ASFLAGS="${ANDROID_ASFLAGS}"
 LDFLAGS="${ANDROID_LDFLAGS} --sysroot ${ANDROID_SYSROOT}"
 
 # Trim whitespace as needed
 CPPFLAGS=$(echo "${CPPFLAGS}" | awk '{$1=$1;print}')
 CFLAGS=$(echo "${CFLAGS}" | awk '{$1=$1;print}')
 CXXFLAGS=$(echo "${CXXFLAGS}" | awk '{$1=$1;print}')
+ASFLAGS=$(echo "${ASFLAGS}" | awk '{$1=$1;print}')
 LDFLAGS=$(echo "${LDFLAGS}" | awk '{$1=$1;print}')
 
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
+export CPPFLAGS CFLAGS CXXFLAGS ASFLAGS LDFLAGS
 
 #####################################################################