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: http://src.chromium.org/svn/trunk/src/build@8767 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
20c89eabd2
Коммит
926e6e0cf7
|
@ -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:
|
||||
|
|
|
@ -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',
|
||||
|
|
Загрузка…
Ссылка в новой задаче