Bug 1269262 - Unbreak build without NO_EXPAND_LIBS in js/src/moz.build after bug 1239083. r=ted a=lizzard
authorJan Beich <jbeich@FreeBSD.org>
Mon, 02 May 2016 08:49:58 +0000
changeset 332756 27e01af4af57705d4b4f58714c24dedf4cbeb56d
parent 332755 cb9344d9c9adc328c22876b7b29e39da51816263
child 332757 1c46cc184a3b141075167329aa974e0cdfc93f99
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, lizzard
bugs1269262, 1239083
milestone48.0a2
Bug 1269262 - Unbreak build without NO_EXPAND_LIBS in js/src/moz.build after bug 1239083. r=ted a=lizzard MozReview-Commit-ID: LIOJ8HFhh2M
netwerk/test/moz.build
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -49,11 +49,16 @@ CppUnitTests([
 
 RESOURCE_FILES += [
     'urlparse.dat',
     'urlparse_unx.dat',
 ]
 
 USE_LIBS += ['static:js']
 
+if CONFIG['ENABLE_INTL_API'] and CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+    # The ICU libraries linked into libmozjs will not include the ICU data,
+    # so link it directly.
+    USE_LIBS += ['icudata']
+
 CXXFLAGS += CONFIG['TK_CFLAGS']
 
 include('/ipc/chromium/chromium-config.mozbuild')