r?sfink - js/src/devtools/automation/winbuildenv.sh should use
From c45c7dbe64c48af610b77073ce500594daa1ce08 Mon Sep 17 00:00:00 2001
vs2015.
---
js/src/devtools/automation/winbuildenv.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
MozReview-Commit-ID: EYS7doPBPoT
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -21,20 +21,20 @@ export OLD_LIBPATH=$(IFS=';'; for d in $
# The various browser/config/mozconfigs/win32/* files use these checks to pick
# the compiler.
if $USE_64BIT; then
. $topsrcdir/build/win64/mozconfig.vs2015
elif test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2015-win64
else
- . $topsrcdir/build/win32/mozconfig.vs2010
+ . $topsrcdir/build/win32/mozconfig.vs2015
fi
# 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://api.pub.build.mozilla.org/tooltool/}
- ( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
+ TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
+ ( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
fi
fi