Bug 1407468 - Only build js/src when building toolkit. r?mshal
--- a/moz.build
+++ b/moz.build
@@ -96,17 +96,18 @@ if not CONFIG['JS_STANDALONE']:
GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
DIRS += [
'build',
'tools',
'probes',
]
-if CONFIG['COMPILE_ENVIRONMENT']:
+if CONFIG['COMPILE_ENVIRONMENT'] and (CONFIG['MOZ_WIDGET_TOOLKIT'] or
+ CONFIG['JS_STANDALONE']):
DIRS += ['js/src']
DIRS += [
'config/external/fdlibm',
'config/external/nspr',
'config/external/zlib',
'memory',
'mfbt',
--- a/old-configure.in
+++ b/old-configure.in
@@ -5027,17 +5027,17 @@ if test -n "$_subconfigure_subdir"; then
srcdir="$srcdir/.."
_save_ac_configure_args="$ac_configure_args"
ac_configure_args="$_subconfigure_config_args"
AC_OUTPUT_SUBDIRS_NOW("$_subconfigure_subdir",$cache_file)
ac_configure_args="$_save_ac_configure_args"
srcdir="$_save_srcdir"
fi
-if test "$COMPILE_ENVIRONMENT"; then
+if test "$COMPILE_ENVIRONMENT" -a "$MOZ_WIDGET_TOOLKIT"; then
export WRAP_LDFLAGS
dnl ========================================================
dnl = Setup a nice relatively clean build environment for
dnl = sub-configures.
dnl ========================================================
CC="$_SUBDIR_CC"