Bug 919528 - use short path to MSVS10, set LD using _VSPATH. r=ted
authorJohn Hopkins <jhopkins@mozilla.com>
Tue, 24 Sep 2013 14:31:53 -0400
changeset 148474 482d31cbd7b83a14bee4a2ecdeb4919d6b6b9753
parent 148473 a6eac36896d224b544f41afa804829862811f0bd
child 148475 c5550f96b7c1e99a54b91732f53d96d458ff7ede
push id25343
push userkwierso@gmail.com
push dateWed, 25 Sep 2013 02:43:37 +0000
treeherdermozilla-central@ce5bc913350a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs919528
milestone27.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 919528 - use short path to MSVS10, set LD using _VSPATH. r=ted
build/win32/mozconfig.vs2010-win64
build/win64/mozconfig.vs2010
--- a/build/win32/mozconfig.vs2010-win64
+++ b/build/win32/mozconfig.vs2010-win64
@@ -1,11 +1,12 @@
 
-if [ -d "/c/Program Files (x86)/Microsoft Visual Studio 10.0" ]; then
-  _VSPATH="/c/Program Files (x86)/Microsoft Visual Studio 10.0"
+if [ -d "/c/PROGRA~2/MICROS~2.0" ]; then
+  # /c/Program Files (x86)/Microsoft Visual Studio 10.0
+  _VSPATH="/c/PROGRA~2/MICROS~2.0"
 else
   _VSPATH="/c/tools/msvs10"
 fi
 
 ## SDK redist ##
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC100.CRT
 
 ## moz tools location for 64-bit builders ##
--- a/build/win64/mozconfig.vs2010
+++ b/build/win64/mozconfig.vs2010
@@ -1,11 +1,12 @@
 
-if [ -d "/c/Program Files (x86)/Microsoft Visual Studio 10.0" ]; then
-  _VSPATH="/c/Program Files (x86)/Microsoft Visual Studio 10.0"
+if [ -d "/c/PROGRA~2/MICROS~2.0" ]; then
+  # /c/Program Files (x86)/Microsoft Visual Studio 10.0
+  _VSPATH="/c/PROGRA~2/MICROS~2.0"
 else
   _VSPATH="/c/tools/msvs10"
 fi
 
 ## SDK redist ##
 export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC100.CRT
 
 ## includes: win8 sdk includes, winrt headers for metro, msvc 10 std library, directx sdk for d3d9 ##
@@ -15,17 +16,17 @@ export INCLUDE=/c/Program\ Files\ \(x86\
 export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
 export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
 
 ## paths: win8 sdk x64 (64-bit) tools, msvc 10 (64-bit) build toolchain, moz tools  ##
 export PATH="/c/Program Files (x86)/Windows Kits/8.0/bin/x64:${_VSPATH}/Common7/IDE:${_VSPATH}/VC/BIN/amd64:${_VSPATH}/VC/BIN/x86_amd64:${_VSPATH}/VC/BIN:${_VSPATH}/Common7/Tools:${_VSPATH}/VC/VCPackages:${PATH}"
 
 # Use 32bit linker for PGO crash bug.
 # https://connect.microsoft.com/VisualStudio/feedback/details/686117/
-export LD=c:/tools/msvs10/VC/BIN/x86_amd64/link.exe
+export LD="${_VSPATH}/VC/BIN/x86_amd64/link.exe"
 
 . $topsrcdir/build/mozconfig.vs2010-common
 
 mk_export_correct_style LIB
 mk_export_correct_style LIBPATH
 mk_export_correct_style PATH
 mk_export_correct_style INCLUDE
 mk_export_correct_style WIN32_REDIST_DIR