Backout 65a26453f9a6 (bug 823109) cause it still breaks some Windows builds
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 24 Jan 2013 23:48:17 +0100
changeset 130475 ed1d3c2794a86f57acc4f9be62a5afcd7088a68a
parent 130474 cf616942809883f95406b776f5f8cc2e23083e7a
child 130476 8a3e1130be716d2f323272270a9e831dc77411e2
push id317
push userbbajaj@mozilla.com
push dateTue, 07 May 2013 01:20:33 +0000
treeherdermozilla-release@159a10910249 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs823109
milestone21.0a1
backs out65a26453f9a6acf0bd9f9254b3017a88140dd9e4
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
Backout 65a26453f9a6 (bug 823109) cause it still breaks some Windows builds
gfx/angle/Makefile.in
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -127,32 +127,21 @@ CPPSRCS += \
 # End gpy translation. Remainder of targets are in src/libEGL/Makefile.in and
 # src/libGLESv2/Makefile.in
 
 ifdef MOZ_ANGLE_RENDERER
 
 # libEGL depends on (links against!) libGLESv2!
 DIRS = src/libGLESv2 src/libEGL
 
-
-space := $(NULL) $(NULL)
-
-# We use a trick from http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
-# to escape possible spaces in MOZ_D3DX9_CAB and MOZ_D3DCOMPILER_CAB
-
+libs::
 ifdef MOZ_D3DX9_CAB
-libs:: $(DIST)/bin/$(MOZ_D3DX9_DLL)
-
-$(DIST)/bin/$(MOZ_D3DX9_DLL): $(subst $(space),\$(space),$(MOZ_D3DX9_CAB))
 	expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
 endif
 ifdef MOZ_D3DCOMPILER_CAB
-libs:: $(DIST)/bin/$(MOZ_D3DCOMPILER_DLL)
-
-$(DIST)/bin/$(MOZ_D3DCOMPILER_DLL): $(subst $(space),\$(space),$(MOZ_D3DCOMPILER_CAB))
 	expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
 endif
 
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # We have to filter out -pedantic, because of