diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 23:44:51 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 23:44:51 +0000 |
| commit | 981bcd3333f0890b3e2c8f48424297b63c61a5d5 (patch) | |
| tree | de987627b4e8fa5e7d967bc6aa2b5b5a5bd84f08 /build/SConscript.main | |
| parent | 814a9aba9358a6302eee45ac05d60b1f881cc51b (diff) | |
| download | chromium_src-981bcd3333f0890b3e2c8f48424297b63c61a5d5.zip chromium_src-981bcd3333f0890b3e2c8f48424297b63c61a5d5.tar.gz chromium_src-981bcd3333f0890b3e2c8f48424297b63c61a5d5.tar.bz2 | |
Allow optimized builds on Linux.
Review URL: http://codereview.chromium.org/10857
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index cccbd6a..cf59228 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -37,13 +37,12 @@ root_env = Environment( CHROME_SRC_DIR = '$MAIN_DIR/..', DESTINATION_ROOT = '$MAIN_DIR/Hammer', - TARGET_ROOT = '$DESTINATION_ROOT', # Where ComponentTestProgram() will build test executables. - TESTS_DIR = '$TARGET_ROOT', + TESTS_DIR = '$DESTINATION_ROOT', # Where ComponentProgram() will build program executables. - STAGING_DIR = '$TARGET_ROOT', + STAGING_DIR = '$DESTINATION_ROOT', # Where ComponentLibrary() will build libraries. LIBS_DIR = '$COMPONENT_LIBRARY_DIR', @@ -441,16 +440,8 @@ windows_env.AppendENVPath('PATH', ';C:\\WINDOWS\\system32') # Linux specific linux_env = root_env.Clone() -environment_list.append(linux_env) linux_env.Tool('target_platform_linux') -linux_env.Tool('target_debug') linux_env.Tool('yacc') -linux_env.Replace( - BUILD_TYPE = 'debug-linux', - BUILD_TYPE_DESCRIPTION = 'Linux debug build', -) -linux_env.Append(BUILD_GROUPS = ['default']) - # TODO(bradnelson): this is needed for now because target_platform_linux has # OS_LINUX defined in a weird way. @@ -568,6 +559,25 @@ if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: 'libxslt requested in SYSTEM_LIBS but not found\n') sys.exit(1) +linux_dbg = linux_env.Clone() +environment_list.append(linux_dbg) +linux_dbg.Replace( + BUILD_TYPE = 'dbg', + BUILD_TYPE_DESCRIPTION = 'Linux debug build', +) +linux_dbg.Tool('target_debug') +linux_dbg.Append(BUILD_GROUPS = ['default']) + +linux_opt = linux_env.Clone() +environment_list.append(linux_opt) +# Disable rpath for faster startup. +linux_opt.Append(RPATH = []) +linux_opt.Replace( + BUILD_TYPE = 'opt', + BUILD_TYPE_DESCRIPTION = 'Linux optimized build', +) +linux_opt.Tool('target_optimized') + # -------------------------------------------------------------------------- # Mac specific |