Bug 1175413 - Cleanup usages of MOZ_ICU_CFLAGS. r=mshal

intl/unicharutil/util/internal/Makefile.in

@@ -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

intl/unicharutil/util/internal/moz.build

@@ -18,6 +18,9 @@ LOCAL_INCLUDES += [
     '..',
 ]
 
+if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+
 FAIL_ON_WARNINGS = True
 
 DIST_INSTALL = True

js/src/Makefile.in

@@ -67,26 +67,6 @@ 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:

js/src/moz.build

@@ -604,6 +604,9 @@ if CONFIG['OS_ARCH'] == 'SunOS':
         'socket',
     ]
 
+CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+
 if CONFIG['GNU_CXX']:
     FAIL_ON_WARNINGS = True