Add OPT=1 flag to build optimized on Linux.

build/SConscript.main

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import shutil
 import sys
 
 
 p = ARGUMENTS.get('PROGRESS')
@@ skipping 19 matching lines @@
     tools = ['component_setup'],
 
     # Requested list of system (shared) libraries, from the comma separated
     # SYSTEM_LIBS command-line argument
     req_system_libs = [],
     # All supported system libraries, for the help message
     all_system_libs = [],
 
     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',
 
     # TODO(hammer):  when Hammer supports this...
     # Have Hammer prefix all Library aliases with lib_ (to avoid
     # collisions with the component names themselves).
     #COMPONENT_LIBRARY_ALIAS = 'lib_$LIBNAME',
 
     # Disable running of tests thru scons for now.
@@ skipping 377 matching lines @@
 windows_env['ENV']['SystemDrive'] = os.environ.get('SystemDrive', '')
 windows_env['ENV']['USERPROFILE'] = os.environ.get('USERPROFILE', '')
 
 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.
 linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX'])
 
 # Copy some environment variables from the outer environment to the
 # SCons.Environment if they exist.
 for envvar in ('CC', 'CXX'):
   if envvar in os.environ:
     linux_env[envvar] = os.environ[envvar]
@@ skipping 95 matching lines @@
           'libxml requested in SYSTEM_LIBS but not found\n')
       sys.exit(1)
   if root_env.WantSystemLib('libxslt'):
     try:
       linux_env.ParseConfig('pkg-config --cflags --libs libxslt')
     except OSError, e:
       print ('\n'
           '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
 
 mac_env = root_env.Clone()
 environment_list.append(mac_env)
 mac_env.Tool('target_platform_mac')
 mac_env.Tool('target_debug')
 mac_env.Replace(
     BUILD_TYPE = 'debug-mac',
     BUILD_TYPE_DESCRIPTION = 'Mac debug build',
@@ skipping 192 matching lines @@
         'all_libraries',
         'all_languages',
         'all_programs',
         'all_test_programs',
     ], projects = [p],
     COMPONENT_VS_PROJECT_SCRIPT_PATH=(
         'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
 )
 
 # -------------------------------------------------------------------------