diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-26 23:11:54 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-26 23:11:54 +0000 |
| commit | fb2c5884aed83a46874cc18828510e41c7e7cc9b (patch) | |
| tree | 2de30844f768beb89a9578b90401a306834aff2b /gears | |
| parent | 8085dbc8b9e61052d830762c0031dfdd1241daba (diff) | |
| download | chromium_src-fb2c5884aed83a46874cc18828510e41c7e7cc9b.zip chromium_src-fb2c5884aed83a46874cc18828510e41c7e7cc9b.tar.gz chromium_src-fb2c5884aed83a46874cc18828510e41c7e7cc9b.tar.bz2 | |
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
Diffstat (limited to 'gears')
| -rw-r--r-- | gears/SConscript.dll | 2 | ||||
| -rw-r--r-- | gears/SConscript.googleurl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gears/SConscript.dll b/gears/SConscript.dll index c987f2d..befdc9a 100644 --- a/gears/SConscript.dll +++ b/gears/SConscript.dll @@ -268,7 +268,7 @@ env_browser.Append( # 'base', 'gd', 'googleurl-gears', -# 'icuuc', +# env_browser['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'jpeg', 'modp_b64', 'png', diff --git a/gears/SConscript.googleurl b/gears/SConscript.googleurl index 865ba03..771c0e7 100644 --- a/gears/SConscript.googleurl +++ b/gears/SConscript.googleurl @@ -70,7 +70,7 @@ env.ChromeStaticLibrary('googleurl-gears', input_files) # LIBS = [ # 'googleurl', # 'base', -# 'icuuc', +# env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed # 'gtest', # ] #) |