Bug 919528 - export LD path that works with both GNU make and Pymake. r=catlee
authorJohn Hopkins <jhopkins@mozilla.com>
Wed, 25 Sep 2013 06:52:30 -0400
changeset 148547 681a8e611edeb5ab9a613ca5539a2f4410c74f5e
parent 148546 68d279364a8b985754e847828eacd0e361f89aeb
child 148586 c7f8a8d01f9401a0ffc322d0f764a75242e2958c
child 161440 de0a3c68a036f0ec1cb0eb8b3e589f7aef377745
push id25346
push userjhopkins@mozilla.com
push dateWed, 25 Sep 2013 10:53:00 +0000
treeherdermozilla-central@681a8e611ede [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee
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 - export LD path that works with both GNU make and Pymake. r=catlee
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