More updates to build optimization settings.

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
 
 
 if sys.platform == 'win32':
@@ skipping 493 matching lines @@
 linux_env.Append(
     # We need rt for clock_gettime.
     LIBS = ['rt'],
 
     ICU_LIBS = ['icu'],
 )
 
 # Build an "official" build (DCHECKs completely compiled out, etc).
 if ARGUMENTS.get('OFFICIAL') == '1':
   linux_env.Append(CPPDEFINES=['OFFICIAL_BUILD'])
+  # Make sure units of code and data go in their own section, and then GC them
+  # in the linker to remove unreferenced data and code.  Currently gold doesn't
+  # support --gc-sections, so you'll have to build with the original GNU ld.
+  linux_env.Append(CCFLAGS_OPTIMIZED=['-ffunction-sections', '-fdata-sections'])
+  linux_env.Append(LINKFLAGS_OPTIMIZED=['-Wl,--gc-sections'])
 
 # Build with support for gcov when COVERAGE=1.
 if ARGUMENTS.get('COVERAGE') == '1':
   linux_env.Append(CCFLAGS=['-fprofile-arcs', '-ftest-coverage'])
   linux_env.Append(LINKFLAGS=['-fprofile-arcs'])
 
 # Build with support for gprof when PROFILE=1.
 if ARGUMENTS.get('PROFILE') == '1':
   linux_env.Append(CCFLAGS=['-pg', '-g'])
   linux_env.Append(LINKFLAGS=['-pg'])
 
 # Build with symbols (useful for opt builds, for example) when SYMBOLS=1.
-# Otherwise if we're building release, strip all symbols from our output.
 if ARGUMENTS.get('SYMBOLS') == '1':
   linux_env.Append(CCFLAGS=['-g'])
-else:
-  linux_env.Append(CCFLAGS_OPTIMIZED=['-ffunction-sections', '-fdata-sections'])
-  linux_env.Append(LINKFLAGS_OPTIMIZED=['-Wl,--gc-sections', '-s'])
 
 # 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:
     linux_env.ParseConfig('pkg-config --cflags --libs nss')
     linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
@@ skipping 281 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'),
 )
 
 # -------------------------------------------------------------------------