diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
| commit | de2c4cca42e52e97d240f6de1dbc8094777f9871 (patch) | |
| tree | 0d5bd659b3a6da4cdfa1831e174a730d12769595 /build | |
| parent | 1c4fdfb4145e39979c5095546ced9f07578ccb4d (diff) | |
| download | chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.zip chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.gz chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.bz2 | |
Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the updated ICU dep that uses it as well.
Add a SHARED scons command-line flag to build shared libraries.
Review URL: http://codereview.chromium.org/16477
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 4 | ||||
| -rw-r--r-- | build/SConscript.v8 | 6 | ||||
| -rw-r--r-- | build/googleurl_lib.scons | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 5e6bfb1..1b70f11 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -513,6 +513,10 @@ if ARGUMENTS.get('PROFILE') == '1': if ARGUMENTS.get('SYMBOLS') == '1': linux_env.Append(CCFLAGS=['-g']) +# Build shared libraries (useful for fast links) when SHARED=1. +if ARGUMENTS.get('SHARED') == '1': + linux_env.Replace(COMPONENT_STATIC=False) + # Build with system-provided NSS and GTK. if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: try: diff --git a/build/SConscript.v8 b/build/SConscript.v8 index c41c38d..ec0bd83 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -83,9 +83,9 @@ if env.Bit('windows'): # TODO(evanm): this may be necessary on other platforms(?) i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8[0]) -env.ChromeStaticLibrary('v8_snapshot', - ['$V8_MODE_DIR/libraries-empty${OBJSUFFIX}', - '$V8_MODE_DIR/snapshot${OBJSUFFIX}']) +env.ChromeLibrary('v8_snapshot', + ['$V8_MODE_DIR/libraries-empty${OBJSUFFIX}', + '$V8_MODE_DIR/snapshot${OBJSUFFIX}']) env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8.vcproj', dependencies = [ diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons index 22e0f53..9e4f325 100644 --- a/build/googleurl_lib.scons +++ b/build/googleurl_lib.scons @@ -46,7 +46,7 @@ input_files = [ 'src/url_util.cc', ] -env.ChromeStaticLibrary('googleurl', input_files) +env.ChromeLibrary('googleurl', input_files) env.ChromeMSVSProject('$GOOGLEURL_DIR/build/googleurl.vcproj', guid='{EF5E94AB-B646-4E5B-A058-52EF07B8351C}') |