Bug 1175413 - Cleanup usages of MOZ_ICU_CFLAGS. r=mshal
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 23 Jul 2015 09:53:48 +0900
changeset 254241 df05a32cdea63ffc8f134e979064404b0a6594a8
parent 254240 8d8fe6eb918d8ce57f01e53ab367b65f5a9eee00
child 254242 05f6b5bc5b4b53bdcd7781946b89be3867de33d8
push id29094
push usercbook@mozilla.com
push dateThu, 23 Jul 2015 10:02:48 +0000
treeherdermozilla-central@ea320711a2e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1175413
milestone42.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 1175413 - Cleanup usages of MOZ_ICU_CFLAGS. r=mshal
intl/unicharutil/util/internal/Makefile.in
intl/unicharutil/util/internal/moz.build
js/src/Makefile.in
js/src/moz.build
deleted file mode 100644
--- a/intl/unicharutil/util/internal/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# 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/.
-
-ifdef ENABLE_INTL_API
-LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
-endif
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -13,11 +13,14 @@ include('../objs.mozbuild')
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '..',
 ]
 
+if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+
 FAIL_ON_WARNINGS = True
 
 DIST_INSTALL = True
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -62,36 +62,16 @@ endif
 
 INSTALL_TARGETS += jsconfig
 jsconfig_FILES = $(export_files)
 jsconfig_DEST = $(DIST)/include
 jsconfig_TARGET := export
 
 include $(topsrcdir)/config/rules.mk
 
-#############################################
-# BEGIN ECMAScript Internationalization API
-#
-
-# ICU headers need to be available whether we build with the complete
-# Internationalization API or not - ICU stubs rely on them.
-
-LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
-
-ifdef ENABLE_INTL_API
-ifndef MOZ_NATIVE_ICU
-
-endif
-endif
-
-#
-# END ECMAScript Internationalization API
-#############################################
-
-
 # check_vanilla_allocations.py is tailored to Linux, so only run it there.
 # That should be enough to catch any problems.
 check-vanilla-allocations:
 	$(PYTHON) $(topsrcdir)/config/check_vanilla_allocations.py $(REAL_LIBRARY)
 
 # The "aggressive" variant will likely fail on some compiler/platform
 # combinations, but is worth running by hand every once in a while.
 check-vanilla-allocations-aggressive:
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -599,14 +599,17 @@ if CONFIG['OS_ARCH'] == 'Linux':
 if CONFIG['OS_ARCH'] == 'SunOS':
     OS_LIBS += [
         'posix4',
         'dl',
         'nsl',
         'socket',
     ]
 
+CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+
 if CONFIG['GNU_CXX']:
     FAIL_ON_WARNINGS = True
 
 NO_EXPAND_LIBS = True
 
 DIST_INSTALL = True