diff --git a/setenv-android.sh b/setenv-android.sh
index a329786b..141859a8 100755
--- a/setenv-android.sh
+++ b/setenv-android.sh
@@ -11,7 +11,7 @@
 # See http://www.cryptopp.com/wiki/Android_(Command_Line) for more details
 # ====================================================================
 
-set -eu
+# set -eu
 
 unset IS_CROSS_COMPILE
 
@@ -382,7 +382,7 @@ if [[ ("$COUNT" -ne "0") ]]; then
 	echo "*******************************************************************************"
 fi
 
-COUNT=$(echo -n "$AOSP_STL_LIB" | egrep -i -c 'libc++)')
+COUNT=$(echo -n "$AOSP_STL_LIB" | egrep -i -c 'libc\+\+)')
 if [[ ("$COUNT" -ne "0") ]]; then
 	echo
 	echo "*******************************************************************************"
diff --git a/setenv-embedded.sh b/setenv-embedded.sh
index c6259645..5f7b1fa9 100755
--- a/setenv-embedded.sh
+++ b/setenv-embedded.sh
@@ -13,7 +13,7 @@
 # See http://www.cryptopp.com/wiki/ARM_Embedded_(Command_Line) for details.
 # ====================================================================
 
-set -eu
+# set -eu
 
 # Unset old options
 
diff --git a/setenv-ios.sh b/setenv-ios.sh
index 597a1528..92bc39bc 100755
--- a/setenv-ios.sh
+++ b/setenv-ios.sh
@@ -11,7 +11,7 @@
 # See http://www.cryptopp.com/wiki/iOS_(Command_Line) for more details
 # ====================================================================
 
-set -eu
+# set -eu
 
 #########################################
 #####       Clear old options       #####