Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1829049 - Unambiguously enable STL wrapping on all platforms. r=firefox-build-system-reviewers,ahochheiden

Browse Source 
First, the setup in js/src/old-configure.in was actually doing nothing
for js, since there weren't corresponding AC_SUBST/AC_SUBST_LIST.

As mentioned in the commit message for bug 1274334, libmozglue contains
operator new/operator delete overrides, so this didn't cause much harm,
especially because js has limited use of plain operator new.

Second, we take on the occasion to move the definitions to python
configure. To match when the STL wrapping was enabled, we move it to
toolkit/moz.configure, which is included by all Gecko-based projects,
but explicitly not by standalone js (preserving its previous behavior,
which is actually desirable for standalone js), and not by other
projects such as tools/crashreporter/injects.

Differential Revision: https://phabricator.services.mozilla.com/D175980
This commit is contained in:
Mike Hommey 2023-04-26 23:32:16 +00:00
parent 3dc5043ae7
commit a533b1ac51
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/old-configure.in
View File

@ -543,15 +543,6 @@ AC_LANG_CPLUSPLUS
MOZ_CXX11
case "${OS_TARGET}" in
WINNT|Darwin|Android)
;;
*)
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
;;
esac
dnl Checks for header files.
dnl ========================================================
AC_HEADER_DIRENT

13
old-configure.in
View File

@ -125,9 +125,6 @@ case "$target" in
fi
WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
fi
WRAP_STL_INCLUDES=1
STL_FLAGS="-I${DIST}/stl_wrappers"
else
# Check w32api version
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
@ -176,9 +173,6 @@ fi # COMPILE_ENVIRONMENT
AC_SUBST(GNU_CC)
AC_SUBST(GNU_CXX)
AC_SUBST_LIST(STL_FLAGS)
AC_SUBST(WRAP_STL_INCLUDES)
dnl ========================================================
dnl set the defaults first
dnl ========================================================
@ -603,13 +597,6 @@ MOZ_CXX11
AC_LANG_C
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
if test "$MOZ_BUILD_APP" = "tools/crashreporter/injector"; then
WRAP_STL_INCLUDES=
fi
dnl Checks for header files.
dnl ========================================================
AC_HEADER_DIRENT

9
toolkit/moz.configure
View File

@ -3314,3 +3314,12 @@ option(
)
set_config("MOZ_SYSTEM_POLICIES", True, when="--enable-system-policies")
# STL wrapping
# ==============================================================
set_config("WRAP_STL_INCLUDES", True)
set_config(
"STL_FLAGS",
depends(build_environment.dist)(lambda dist: [f"-I{dist}/stl_wrappers"]),
)