Bug 1034594 - Work around msys silliness breaking the build for some people after bug 1033958. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 08 Jul 2014 07:30:33 +0900
changeset 213549 93e07b92f879b13c3369f61696711265340c08ab
parent 213548 ffc53bd04d491e4637a50dd82410207c91f92b97
child 213550 19176ab7d700ce6ea6bc9a7ad60ce15cfa837925
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1034594, 1033958
milestone33.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 1034594 - Work around msys silliness breaking the build for some people after bug 1033958. r=gps
intl/icu/Makefile.in
--- a/intl/icu/Makefile.in
+++ b/intl/icu/Makefile.in
@@ -46,20 +46,22 @@ ifdef ENABLE_INTL_API
 ifndef MOZ_NATIVE_ICU
 default:: buildicu
 
 # - Force ICU to use the standard suffix for object files because expandlibs
 #   will discard all files with a non-standard suffix (bug 857450).
 # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
 buildicu::
 # ICU's build system is full of races, so force non-parallel build.
+# Msys screws up GENRBOPTS when it contains spaces, so all genrb flags need
+# to be stuck together. See https://bugzilla.mozilla.org/show_bug.cgi?id=1034594#c34
 ifdef CROSS_COMPILE
-	+$(MAKE) -j1 -C host STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R -C'
+	+$(MAKE) -j1 -C host STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-kRC'
 endif
-	+$(MAKE) -j1 -C target STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+	+$(MAKE) -j1 -C target STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-kR'
 	$(ICU_LIB_RENAME)
 
 distclean clean::
 ifdef CROSS_COMPILE
 	+$(MAKE) -C host $@ STATIC_O=$(OBJ_SUFFIX)
 endif
 	+$(MAKE) -C target $@ STATIC_O=$(OBJ_SUFFIX)