Bug 1110760 - Followup to avoid build failure with Windows SDK v7.0 and v7.0A. r=gps a=lsblakk
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 09 Jan 2015 04:10:00 -0500
changeset 242902 fe217a0d2e9a
parent 242901 beb62e1ad523
child 242903 fc47c7a95f85
push id4335
push userCallek@gmail.com
push date2015-01-19 19:31 +0000
treeherdermozilla-beta@fe217a0d2e9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, lsblakk
bugs1110760
milestone36.0
Bug 1110760 - Followup to avoid build failure with Windows SDK v7.0 and v7.0A. r=gps a=lsblakk Also normalize multiple occurrences of path separators.
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, re; print ";".join(re.sub("/+", "/", s.lower().replace(os.sep, "/")).replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64").replace("v7.0/lib", "v7.0/lib/x64").replace("v7.0a/lib", "v7.0a/lib/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