Bug 1262567 - Use TOOLTOOL_DIR to set VSPATH. r=glandium

--HG-- extra : rebase_source : a1f7f21b3a6ac1d8356c469af57015a292b8bdfb
dothq · Apr 7, 2016 · 82f35c4 · 82f35c4
1 parent 4bc7ae6
commit 82f35c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/win32/mozconfig.vs2015-win64 b/build/win32/mozconfig.vs2015-win64
@@ -1,5 +1,6 @@
 if [ -z "${VSPATH}" ]; then
-    VSPATH="$(cd ${topsrcdir} && pwd)/vs2015u1"
+    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u1"
 fi
 
 export WINDOWSSDKDIR="${VSPATH}/SDK"

diff --git a/build/win64/mozconfig.vs2015 b/build/win64/mozconfig.vs2015
@@ -1,5 +1,6 @@
 if [ -z "${VSPATH}" ]; then
-    VSPATH="$(cd ${topsrcdir} && pwd)/vs2015u1"
+    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u1"
 fi
 
 export WINDOWSSDKDIR="${VSPATH}/SDK"