diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 23:19:27 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 23:19:27 +0000 |
| commit | fb16375636b4ed6e0ef8f14963989f43298b395e (patch) | |
| tree | 3bc23d6698cf55dc2e1eb3e5598b7491d97c8527 /build | |
| parent | e60a409457cdc45aeca477d3e86156cfa485a9c8 (diff) | |
| download | chromium_src-fb16375636b4ed6e0ef8f14963989f43298b395e.zip chromium_src-fb16375636b4ed6e0ef8f14963989f43298b395e.tar.gz chromium_src-fb16375636b4ed6e0ef8f14963989f43298b395e.tar.bz2 | |
Allow "hammer Hammer SHARED=1" to build cleanly.
This change is just disabling the targets that don't currently work. This is
needed for the debug linux webkit builder that is coming online real soon now.
Review URL: http://codereview.chromium.org/19041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 10 | ||||
| -rw-r--r-- | build/SConscript.v8 | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 44dcb20..d6df2c3 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -540,6 +540,16 @@ if ARGUMENTS.get('SYMBOLS') == '1': if ARGUMENTS.get('SHARED') == '1': linux_env.Replace(COMPONENT_STATIC=False) + # The shared library build only works for test_shell and test_shell_tests, + # so filter out Chrome. + print "Filtering out chrome and media build targets in shared object build." + linux_env.FilterOut( + BUILD_SCONSCRIPTS = [ + '$CHROME_DIR/chrome.scons', + '$MEDIA_DIR/media.scons', + ] + ) + # 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 ec0bd83..fc7fa81 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -15,6 +15,10 @@ mode = 'release' if env['TARGET_DEBUG']: mode = 'debug' +# Don't build V8 as a shared object because the v8 scons file doesn't support +# it. +env.Replace(COMPONENT_STATIC=True) + env = env.Clone( V8_MODE = mode, V8_MODE_DIR = '$V8_DIR/obj/$V8_MODE', |