Bug 1054154 - Revert part of bug 1042878 to unbreak build when system ICU is installed. r=froydnj, r=glandium
authorJan Beich <jbeich@vfemail.net>
Thu, 14 Aug 2014 22:07:00 -0400
changeset 200265 8944f233d14b0863b90ec4e6800a0735bd7cafba
parent 200264 53c7fcb7ead91a2bda0ec1fd26de32c8058e04dd
child 200266 2ec59bdec08879b5c2cfd0ab50f6e62cfdb12d7a
push id47860
push userryanvm@gmail.com
push dateTue, 19 Aug 2014 12:42:37 +0000
treeherdermozilla-inbound@bb91698edd20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, glandium
bugs1054154, 1042878
milestone34.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 1054154 - Revert part of bug 1042878 to unbreak build when system ICU is installed. r=froydnj, r=glandium
intl/unicharutil/util/internal/Makefile.in
intl/unicharutil/util/internal/moz.build
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -2,9 +2,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This makefile builds the version of unicharutils_s static library which uses
 # internal linkage. Components that use frozen (external) linkage should use
 # unicharutil_external_s.
 
+ifdef ENABLE_INTL_API
+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
+endif
+
 DIST_INSTALL = 1
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -9,11 +9,8 @@ include('../objs.mozbuild')
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '..',
     '../../src',
 ]
-
-if CONFIG['ENABLE_INTL_API']:
-    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']