Bug 1451409: Convince Windows Spidermonkey builds to use clang-cl. r=sfink,glandium
authorDavid Major <dmajor@mozilla.com>
Tue, 20 Nov 2018 21:15:49 -0500
changeset 503868 4f1e92f9db113b89425adff91c17c0e5ac153f9a
parent 503867 639212b42347d02e5e3c414d83657137b3affb53
child 503869 306c9aaac8cd1395a17788385cc10997d46b8f2d
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink, glandium
bugs1451409
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1451409: Convince Windows Spidermonkey builds to use clang-cl. r=sfink,glandium
js/src/devtools/automation/winbuildenv.sh
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -20,16 +20,20 @@ echo "export ORIGINAL_LIB=$LIB"
 echo "export ORIGINAL_LIBPATH=$LIBPATH"
 
 if [ -n "$USE_64BIT" ]; then
   . $topsrcdir/build/win64/mozconfig.vs-latest
 else
   . $topsrcdir/build/win32/mozconfig.vs-latest
 fi
 
+mk_export_correct_style CC
+mk_export_correct_style CXX
+mk_export_correct_style LINKER
+
 # PATH also needs to point to mozmake.exe, which can come from either
 # newer mozilla-build or tooltool.
 if ! which mozmake 2>/dev/null; then
     export PATH="$PATH:$SOURCE/.."
     if ! which mozmake 2>/dev/null; then
   TT_SERVER=${TT_SERVER:-https://tooltool.mozilla-releng.net/}
   ( cd $SOURCE/..; $SOURCE/mach artifact toolchain -v --tooltool-manifest $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest --tooltool-url $TT_SERVER --retry 4${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
     fi