From fb2c5884aed83a46874cc18828510e41c7e7cc9b Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Fri, 26 Sep 2008 23:11:54 +0000 Subject: Roll the third_party/icu38 revision in DEPS to have SCons build libicu, not libicuuc. Add a new $ICU_LIBS construction variable to allow different platforms to link with different sets of ICU libraries. Use it in the LIBS lists of the various construction environments used to build the things that link with it. Review URL: http://codereview.chromium.org/4312 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2651 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/mini_installer/SConscript | 2 +- chrome/installer/setup/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/installer') diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 062c1f7..f2a8269 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -113,7 +113,7 @@ env_test.Prepend( ], LIBS = [ 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'base', ], diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index 81e7c9c..a920f31 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -36,7 +36,7 @@ env.Prepend( 'base', 'bspatch', 'common', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'lzma_sdk', 'util', ], -- cgit v1.1