зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1484184 - Remove now unused _RAISE macro check to deal with MSVC 2017 15.8. r=froydnj
--HG-- extra : rebase_source : d93dbda28fff9cdbf0f6a908e0c1d59c152665e5 extra : source : b38403f36056d301321c128be96ee60d14739859
This commit is contained in:
Родитель
60b0d9635e
Коммит
59a91c2a72
|
@ -16,10 +16,9 @@ if CONFIG['WRAP_STL_INCLUDES']:
|
|||
EXPORTS.mozilla += ['throw_gcc.h']
|
||||
elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
|
||||
DEFINES['_HAS_EXCEPTIONS'] = 0
|
||||
if CONFIG['MOZ_MSVC_STL_WRAP_RAISE']:
|
||||
SOURCES += [
|
||||
'msvc_raise_wrappers.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'msvc_raise_wrappers.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
# Keep this file separate to avoid #include'ing windows.h everywhere.
|
||||
|
|
|
@ -281,35 +281,8 @@ case "$target" in
|
|||
|
||||
unset _MSVC_VER_FILTER
|
||||
|
||||
AC_CACHE_CHECK(for overridable _RAISE,
|
||||
ac_cv_have__RAISE,
|
||||
[
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
_SAVE_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0"
|
||||
AC_TRY_COMPILE([#include <xstddef>
|
||||
#undef _RAISE
|
||||
#define _RAISE(x) externallyDefinedFunction((x).what())
|
||||
#include <vector>
|
||||
],
|
||||
[std::vector<int> v; return v.at(1);],
|
||||
ac_cv_have__RAISE="no",
|
||||
ac_cv_have__RAISE="yes")
|
||||
CXXFLAGS="$_SAVE_CXXFLAGS"
|
||||
AC_LANG_RESTORE
|
||||
])
|
||||
if test "$ac_cv_have__RAISE" = "yes"; then
|
||||
WRAP_STL_INCLUDES=1
|
||||
MOZ_MSVC_STL_WRAP_RAISE=1
|
||||
AC_DEFINE(MOZ_MSVC_STL_WRAP_RAISE)
|
||||
else
|
||||
AC_MSG_ERROR([Gecko exception wrapping doesn't understand your your MSVC/SDK. Please file a bug describing this error and your build configuration.])
|
||||
fi
|
||||
|
||||
if test "$WRAP_STL_INCLUDES" = "1"; then
|
||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||
fi
|
||||
WRAP_STL_INCLUDES=1
|
||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||
CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
|
||||
CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
|
||||
else
|
||||
|
@ -395,7 +368,6 @@ AC_SUBST(GNU_CXX)
|
|||
|
||||
AC_SUBST_LIST(STL_FLAGS)
|
||||
AC_SUBST(WRAP_STL_INCLUDES)
|
||||
AC_SUBST(MOZ_MSVC_STL_WRAP_RAISE)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Checks for programs.
|
||||
|
|
Загрузка…
Ссылка в новой задаче