Bug 919528 - use short path to MSVS10, set LD using _VSPATH. r=ted

Brli · Sep 24, 2013 · ee25b59 · ee25b59
1 parent b086ce0
commit ee25b59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build/win32/mozconfig.vs2010-win64 b/build/win32/mozconfig.vs2010-win64
@@ -1,6 +1,7 @@
 
-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

diff --git a/build/win64/mozconfig.vs2010 b/build/win64/mozconfig.vs2010
@@ -1,6 +1,7 @@
 
-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
@@ -20,7 +21,7 @@ export PATH="/c/Program Files (x86)/Windows Kits/8.0/bin/x64:${_VSPATH}/Common7/
 
 # 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