author | aleth <aleth@instantbird.org> |
Thu, 07 Apr 2016 16:02:34 +0200 | |
changeset 330285 | a60d4b9232b19fb0d9726bdc2376fe4924dee9fc |
parent 330284 | 506fd0f2d9d320109e164af1839153b8cff09721 |
child 330286 | 615f67ac2823f0428e54a64c42037c645076c39e |
push id | 6048 |
push user | kmoir@mozilla.com |
push date | Mon, 06 Jun 2016 19:02:08 +0000 |
treeherder | mozilla-beta@46d72a56c57d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1262567 |
milestone | 48.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
|
build/win32/mozconfig.vs2015-win64 | file | annotate | diff | comparison | revisions | |
build/win64/mozconfig.vs2015 | file | annotate | diff | comparison | revisions |
--- a/build/win32/mozconfig.vs2015-win64 +++ b/build/win32/mozconfig.vs2015-win64 @@ -1,10 +1,11 @@ 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" export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT" export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86" export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIASDK/bin:${PATH}" export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}"
--- a/build/win64/mozconfig.vs2015 +++ b/build/win64/mozconfig.vs2015 @@ -1,10 +1,11 @@ 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" export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64" export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIASDK/bin/amd64:${PATH}"