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 /build | |
| 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 'build')
| -rw-r--r-- | build/SConscript.googleurl | 2 | ||||
| -rw-r--r-- | build/SConscript.main | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl index 844def0..9792fb5 100644 --- a/build/SConscript.googleurl +++ b/build/SConscript.googleurl @@ -60,7 +60,7 @@ env_tests.Append( LIBS = [ 'googleurl', 'base', - 'icuuc', + env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'gtest', ] ) diff --git a/build/SConscript.main b/build/SConscript.main index 5a9f0a7..f19a459 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -249,6 +249,8 @@ if env['PLATFORM'] == 'win32': '/nologo', '/DEBUG', ], + + ICU_LIBS = ['icu'], ) env.Append( @@ -333,6 +335,8 @@ elif env['PLATFORM'] == 'posix': 'PERL_INCLUDE_PATH, ' 'PERL_INCLUDE_SUFFIX,' '__env__, RDirs, TARGET, SOURCE)}'), + + ICU_LIBS = ['icu'], ) # Build with support for gcov when COVERAGE=1. if ARGUMENTS.get('COVERAGE') == '1': @@ -397,6 +401,8 @@ elif env['PLATFORM'] == 'darwin': 'ApplicationServices', 'Foundation', ], + + ICU_LIBS = ['icu'], ) else: |