Backout changeset 81c2e2ea2dbf (bug 746794) because of bug 758648

This commit is contained in:
Mike Hommey 2012-05-25 18:21:03 +02:00
parent f8e9b0626c
commit 7407614648
4 changed files with 5 additions and 6 deletions

View File

@ -10,7 +10,7 @@
// For some reason, Apple's GCC refuses to honor -fno-exceptions when
// compiling ObjC.
#if __EXCEPTIONS && !(__OBJC__ && __APPLE_CC__)
#if __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
# error "STL code can only be used with -fno-exceptions"
#endif

View File

@ -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

View File

@ -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

View File

@ -65,7 +65,6 @@ 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))