Bug 919528 - Export LD path that works with both GNU make and Pymake. r=catlee, a=NPOTB
authorJohn Hopkins <jhopkins@mozilla.com>
Tue, 24 Sep 2013 21:44:45 -0400
changeset 161028 56f3c1c99217a184f9084af8289e4df90d334fe2
parent 161027 a1ba39670cbb35f6fbc5464c114e47f60b7040c8
child 161029 6b58f332533407916a872bfeb0251fce9b6b98d4
push id2995
push userryanvm@gmail.com
push dateFri, 08 Nov 2013 21:39:15 +0000
treeherdermozilla-beta@0453bfbb7816 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee, NPOTB
bugs919528
milestone26.0
Bug 919528 - Export LD path that works with both GNU make and Pymake. r=catlee, a=NPOTB
build/win64/mozconfig.vs2010
--- a/build/win64/mozconfig.vs2010
+++ b/build/win64/mozconfig.vs2010
@@ -16,17 +16,22 @@ 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="${_VSPATH}/VC/BIN/x86_amd64/link.exe"
+if [ -f /c/PROGRA~2/MICROS~2.0/VC/BIN/x86_amd64/link.exe ]; then
+  # /c/Program Files (x86)/Microsoft Visual Studio 10.0
+  export LD=c:/PROGRA~2/MICROS~2.0/VC/BIN/x86_amd64/link.exe
+else
+  export LD=c:/tools/msvs10/VC/BIN/x86_amd64/link.exe
+fi
 
 . $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