summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-29 04:59:00 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-29 04:59:00 +0000
commit8670ffb68690e8714fb2999fb5466d2d39d72389 (patch)
tree040d7fff36ccde87d811e1c80fe98e82fe014b8c /build
parent65d7001f983ebef9153be6e6aa87762267ae3ed3 (diff)
downloadchromium_src-8670ffb68690e8714fb2999fb5466d2d39d72389.zip
chromium_src-8670ffb68690e8714fb2999fb5466d2d39d72389.tar.gz
chromium_src-8670ffb68690e8714fb2999fb5466d2d39d72389.tar.bz2
ICU changes
* Add an ICU_UTIL_DATA_IMPL #defines to control whether we're expecting the ICU data as ICU_UTIL_DATA_{SHARED,STATIC,FILE}. * Set defaults on the platforms to match our current practice: Windows => shared, Linux => file, Mac => static. * On Mac, link the separate icui18n, icuuc and icudata libs (matching how we're building there), instead of the common icu lib. * Roll the icu38 revision in DEPS to get the updated SCons build. Review URL: http://codereview.chromium.org/5022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main
index f19a459..c038741 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -402,7 +402,7 @@ elif env['PLATFORM'] == 'darwin':
'Foundation',
],
- ICU_LIBS = ['icu'],
+ ICU_LIBS = ['icui18n', 'icuuc', 'icudata'],
)
else: