Bug 1149718: Fix wow_helper lib path for VS2015. r=glandium
authorDavid Major <dmajor@mozilla.com>
Tue, 12 May 2015 18:20:28 -0400
changeset 243618 4f1342c1a891431373cb60e55e74e58e14f8bf0b
parent 243617 d44f5512d5845d7746bd61d183767872b08e1785
child 243619 0dc1b8aadb5723fe179b9db3ec4969f22f3629d3
push id28744
push userkwierso@gmail.com
push dateWed, 13 May 2015 18:12:16 +0000
treeherdermozilla-central@324c3423deaf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1149718
milestone41.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 1149718: Fix wow_helper lib path for VS2015. r=glandium
security/sandbox/win/wow_helper/Makefile.in
--- a/security/sandbox/win/wow_helper/Makefile.in
+++ b/security/sandbox/win/wow_helper/Makefile.in
@@ -25,17 +25,17 @@ CXX = $(call lazy,CXX,"$$(subst amd64_x8
 
 MOZ_WINCONSOLE = 0
 
 include $(topsrcdir)/config/config.mk
 
 # Munge the LIB variable to contain paths to the x64 CRT and system libraries.
 # Unconveniently, none of the paths have the same convention, including the
 # compiler path above.
-LIB = $(call lazy,LIB,$$(shell python -c 'import os; print ";".join(s.lower().replace(os.sep, "/").replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64") for s in os.environ["LIB"].split(";"))'))
+LIB = $(call lazy,LIB,$$(shell python -c 'import os; print ";".join(s.lower().replace(os.sep, "/").replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64").replace("/ucrt/x86", "/ucrt/x64") for s in os.environ["LIB"].split(";"))'))
 
 CXXFLAGS := $(filter-out -arch:IA32,$(CXXFLAGS))
 
 # OS_COMPILE_CXXFLAGS includes mozilla-config.h, which contains x86-specific
 # defines breaking the build.
 OS_COMPILE_CXXFLAGS :=
 
 # LNK1246: '/SAFESEH' not compatible with 'x64' target machine