зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1257468 - Replace tests on BUILDING_JS with tests on MOZ_BUILD_APP==js. r=nalexander
Now that MOZ_BUILD_APP is set to js when building js/src, we can distinguish those builds with MOZ_BUILD_APP==js instead of BUILDING_JS. Consequently, remove BUILDING_JS.
This commit is contained in:
Родитель
dff9555828
Коммит
37d7b30422
|
@ -23,7 +23,7 @@ AC_SUBST(MOZ_SYSTEM_FFI)
|
|||
])
|
||||
|
||||
AC_DEFUN([MOZ_SUBCONFIGURE_FFI], [
|
||||
if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
|
||||
if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then
|
||||
|
||||
if test "$BUILD_CTYPES" -a -z "$MOZ_SYSTEM_FFI"; then
|
||||
# Run the libffi 'configure' script.
|
||||
|
|
|
@ -128,7 +128,7 @@ fi
|
|||
|
||||
AC_DEFUN([MOZ_SUBCONFIGURE_ICU], [
|
||||
|
||||
if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
|
||||
if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then
|
||||
|
||||
if test -n "$USE_ICU" -a -z "$MOZ_SYSTEM_ICU"; then
|
||||
# Set ICU compile options
|
||||
|
|
|
@ -4,7 +4,7 @@ dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|||
|
||||
AC_DEFUN([MOZ_SUBCONFIGURE_JEMALLOC], [
|
||||
|
||||
if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
|
||||
if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then
|
||||
|
||||
# Run jemalloc configure script
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@ ifelse([$1],,define(CONFIGURING_JS,yes))
|
|||
|
||||
dnl Possible ways this can be called:
|
||||
dnl from toplevel configure:
|
||||
dnl JS_STANDALONE= BUILDING_JS=
|
||||
dnl JS_STANDALONE= MOZ_BUILD_APP!=js
|
||||
dnl from js/src/configure invoked by toplevel configure:
|
||||
dnl JS_STANDALONE= BUILDING_JS=1
|
||||
dnl JS_STANDALONE= MOZ_BUILD_APP=js
|
||||
dnl from standalone js/src/configure:
|
||||
dnl JS_STANDALONE=1 BUILDING_JS=1
|
||||
dnl JS_STANDALONE=1 MOZ_BUILD_APP=js
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Find the right NSPR to use.
|
||||
|
@ -38,7 +38,7 @@ ifdef([CONFIGURING_JS],[
|
|||
MOZ_BUILD_NSPR=)
|
||||
])
|
||||
|
||||
if test -z "$BUILDING_JS" || test -n "$JS_STANDALONE"; then
|
||||
if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then
|
||||
_IS_OUTER_CONFIGURE=1
|
||||
fi
|
||||
|
||||
|
@ -99,7 +99,7 @@ else
|
|||
fi
|
||||
|
||||
if test -z "$nspr_opts"; then
|
||||
if test -z "$BUILDING_JS"; then
|
||||
if test "$MOZ_BUILD_APP" != js; then
|
||||
dnl Toplevel configure defaults to using nsprpub from the source tree
|
||||
MOZ_BUILD_NSPR=1
|
||||
which_nspr="source-tree"
|
||||
|
@ -124,7 +124,7 @@ fi
|
|||
|
||||
AC_SUBST(MOZ_BUILD_NSPR)
|
||||
|
||||
if test -n "$BUILDING_JS"; then
|
||||
if test "$MOZ_BUILD_APP" = js; then
|
||||
if test "$JS_POSIX_NSPR" = 1; then
|
||||
AC_DEFINE(JS_POSIX_NSPR)
|
||||
fi
|
||||
|
|
|
@ -58,7 +58,7 @@ def config_status(config):
|
|||
fh.write("__all__ = ['topobjdir', 'topsrcdir', 'defines', "
|
||||
"'non_global_defines', 'substs']")
|
||||
|
||||
if not config.get('BUILDING_JS') or config.get('JS_STANDALONE'):
|
||||
if config.get('MOZ_BUILD_APP') != 'js' or config.get('JS_STANDALONE'):
|
||||
fh.write('''
|
||||
if __name__ == '__main__':
|
||||
args = dict([(name, globals()[name]) for name in __all__])
|
||||
|
@ -69,7 +69,7 @@ if __name__ == '__main__':
|
|||
# Other things than us are going to run this file, so we need to give it
|
||||
# executable permissions.
|
||||
os.chmod('config.status', 0755)
|
||||
if not config.get('BUILDING_JS') or config.get('JS_STANDALONE'):
|
||||
if config.get('MOZ_BUILD_APP') != 'js' or config.get('JS_STANDALONE'):
|
||||
if not config.get('JS_STANDALONE'):
|
||||
os.environ['WRITE_MOZINFO'] = '1'
|
||||
# Until we have access to the virtualenv from this script, execute
|
||||
|
|
|
@ -85,8 +85,6 @@ else
|
|||
DIST="$MOZ_BUILD_ROOT/dist"
|
||||
fi
|
||||
AC_SUBST(JS_STANDALONE)
|
||||
BUILDING_JS=1
|
||||
AC_SUBST(BUILDING_JS)
|
||||
AC_SUBST(autoconfmk)
|
||||
|
||||
MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,
|
||||
|
|
Загрузка…
Ссылка в новой задаче