Bug 1450257 - Set LLVM_CONFIG in mozconfig.stylo and have platform mozconfigs read from this file again
author"Edmund Wong <ewong@pw-wspx.org>"
Tue, 10 Apr 2018 10:14:34 +0800
changeset 23685 fb3ed35de1141b50b5adda1602e860db8d741145
parent 23684 9852dfc1567514e130c4167d93c004fc21019809
child 23686 78c17f98345cd7bd3833f2c3d7055748ab2c61a5
push id14291
push userewong@pw-wspx.org
push dateTue, 10 Apr 2018 02:15:06 +0000
treeherdercomm-central@fb3ed35de114 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1450257
Bug 1450257 - Set LLVM_CONFIG in mozconfig.stylo and have platform mozconfigs read from this file again
build/mozconfig.stylo
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux64/debug
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/macosx64/debug
suite/config/mozconfigs/macosx64/l10n-mozconfig
suite/config/mozconfigs/macosx64/nightly
suite/config/mozconfigs/macosx64/release
suite/config/mozconfigs/macosx64/release-l10n
suite/config/mozconfigs/win32/debug
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win32/release-l10n
suite/config/mozconfigs/win64/debug
suite/config/mozconfigs/win64/nightly
suite/config/mozconfigs/win64/release
suite/config/mozconfigs/win64/release-l10
suite/config/mozconfigs/win64/release-l10n
--- a/build/mozconfig.stylo
+++ b/build/mozconfig.stylo
@@ -1,3 +1,2 @@
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
+# Tell the build system where to find llvm-config for builds on automation.
+export LLVM_CONFIG="${TOOLTOOL_DIR:-$topsrcdir}/clang/bin/llvm-config"
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux32
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/linux64/debug
+++ b/suite/config/mozconfigs/linux64/debug
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,15 +1,16 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/unix/mozconfig.linux
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/macosx64/debug
+++ b/suite/config/mozconfigs/macosx64/debug
@@ -1,13 +1,14 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/local-mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,13 +1,14 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/local-mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 
 # Build lightning locales
--- a/suite/config/mozconfigs/macosx64/nightly
+++ b/suite/config/mozconfigs/macosx64/nightly
@@ -1,13 +1,14 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/local-mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.macosx.common
 . $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
--- a/suite/config/mozconfigs/macosx64/release
+++ b/suite/config/mozconfigs/macosx64/release
@@ -1,13 +1,14 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/local-mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.macosx.common
 . $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/macosx64/release-l10n
+++ b/suite/config/mozconfigs/macosx64/release-l10n
@@ -1,13 +1,14 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
 . $TOOLTOOL_DIR/build/macosx/local-mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 
 # Build lightning locales
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -1,16 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,17 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,17 +1,18 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,16 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/suite/config/mozconfigs/win32/mozconfig.vs2017
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -1,16 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,17 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/win64/release
+++ b/suite/config/mozconfigs/win64/release
@@ -1,17 +1,18 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
rename from suite/config/mozconfigs/win64/release-l10
rename to suite/config/mozconfigs/win64/release-l10n
--- a/suite/config/mozconfigs/win64/release-l10
+++ b/suite/config/mozconfigs/win64/release-l10n
@@ -1,16 +1,17 @@
-. "$topsrcdir/build/mozconfig.comm-support"
+. $topsrcdir/build/mozconfig.comm-support
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
 
-. "$TOOLTOOL_DIR/build/mozconfig.win-common"
-. "$TOOLTOOL_DIR/build/mozconfig.common"
-. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
-. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
+. $TOOLTOOL_DIR/build/mozconfig.win-common
+. $TOOLTOOL_DIR/build/mozconfig.stylo
+. $TOOLTOOL_DIR/build/mozconfig.common
+. $TOOLTOOL_DIR/build/win64/mozconfig.vs-latest
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}