diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h
index bd5c9159b31..0f263dc68b7 100644
--- a/config/gcc-stl-wrapper.template.h
+++ b/config/gcc-stl-wrapper.template.h
@@ -10,7 +10,7 @@
 
 // For some reason, Apple's GCC refuses to honor -fno-exceptions when
 // compiling ObjC.
-#if __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
+#if __EXCEPTIONS && !(__OBJC__ && __APPLE_CC__)
 #  error "STL code can only be used with -fno-exceptions"
 #endif
 
diff --git a/configure.in b/configure.in
index e8bb1fef7f0..3a3efe70a5d 100644
--- a/configure.in
+++ b/configure.in
@@ -3199,11 +3199,11 @@ EOF
                 "$ac_cv_have_visibility_class_bug" = "no"; then
           VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
           WRAP_SYSTEM_INCLUDES=1
-          STL_FLAGS='-I$(DIST)/stl_wrappers'
-          WRAP_STL_INCLUDES=1
         else
           VISIBILITY_FLAGS='-fvisibility=hidden'
         fi # have visibility pragma bug
+        STL_FLAGS='-I$(DIST)/stl_wrappers'
+        WRAP_STL_INCLUDES=1
       fi   # have visibility pragma
     fi     # have visibility(default) attribute
   fi       # have visibility(hidden) attribute
diff --git a/js/src/configure.in b/js/src/configure.in
index 204cdf1baf3..39f02a1b40b 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2877,11 +2877,11 @@ EOF
                 "$ac_cv_have_visibility_class_bug" = "no"; then
           VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
           WRAP_SYSTEM_INCLUDES=1
-          STL_FLAGS='-I$(DIST)/stl_wrappers'
-          WRAP_STL_INCLUDES=1
         else
           VISIBILITY_FLAGS='-fvisibility=hidden'
         fi # have visibility pragma bug
+        STL_FLAGS='-I$(DIST)/stl_wrappers'
+        WRAP_STL_INCLUDES=1
       fi   # have visibility pragma
     fi     # have visibility(default) attribute
   fi       # have visibility(hidden) attribute
diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in
index 6c1a4d8aa8d..15f02ece7eb 100644
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -65,6 +65,7 @@ ifeq (Android,$(OS_TARGET))
 EXTRA_DSO_LDOPTS += -Wl,--wrap=pthread_atfork
 CPPSRCS += BionicGlue.cpp
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android)
+STL_FLAGS =
 endif
 
 ifeq (android, $(MOZ_WIDGET_TOOLKIT))