Backed out changeset 35f665d19e3a (bug 1274334) for causing Gtest failures on STLWrapper. CLOSED TREE

This commit is contained in:
Natalia Csoregi 2023-04-21 15:35:35 +03:00
parent d62e9829b9
commit 56e93e216a
2 changed files with 11 additions and 3 deletions

View file

@ -8,7 +8,9 @@
#ifndef mozilla_${HEADER}_h
#define mozilla_${HEADER}_h
#if defined(__cpp_exceptions) && __cpp_exceptions
// For some reason, Apple's GCC refuses to honor -fno-exceptions when
// compiling ObjC.
#if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
# error "STL code can only be used with -fno-exceptions"
#endif

View file

@ -603,8 +603,14 @@ MOZ_CXX11
AC_LANG_C
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
case "${OS_TARGET}" in
Darwin)
;;
*)
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
;;
esac
if test "$MOZ_BUILD_APP" = "tools/crashreporter/injector"; then
WRAP_STL_INCLUDES=