Revert 120385 - linux: use an in-tree copy of gold by default

Revert 120385 - linux: use an in-tree copy of gold by default

Rather than forcing everyone to configure their search paths etc.
we should just make this work by default.  You can set
the gyp variable linux_use_gold_binary=0 to turn it off.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120356

Review URL: https://chromiumcodereview.appspot.com/9316002

TBR=evan@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120397

[Evan Martin, 2012-02-03 21:06:23]

LGTM

On Fri, Feb 3, 2012 at 12:55 PM,  <tim@chromium.org> wrote:
> Reviewers: Evan Martin,
>
> Description:
> Revert 120385 - linux: use an in-tree copy of gold by default
>
> Rather than forcing everyone to configure their search paths etc.
> we should just make this work by default.  You can set
> the gyp variable linux_use_gold_binary=0 to turn it off.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120356
>
> Review URL: https://chromiumcodereview.appspot.com/9316002
>
> TBR=evan@chromium.org
>
> Please review this at https://chromiumcodereview.appspot.com/9328004/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     DEPS
>  M     build/common.gypi
>  M     tools/licenses.py
>
>
> Index: DEPS
> ===================================================================
> --- DEPS        (revision 120396)
> +++ DEPS        (working copy)
> @@ -414,9 +414,6 @@
>
>     "src/third_party/WebKit/Tools/gdb":
>       Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"),
> -
> -    "src/third_party/gold":
> -      "/trunk/deps/third_party/gold@120368",
>   },
>  }
>
> Index: build/common.gypi
> ===================================================================
> --- build/common.gypi   (revision 120396)
> +++ build/common.gypi   (working copy)
> @@ -376,15 +376,6 @@
>         }, {
>           'enable_plugin_installation%': 1,
>         }],
> -
> -        # Set to 0 to not use third_party/gold as the linker.
> -        # On by default for x64 Linux.  Off for ChromeOS as cross-compiling
> -        # makes things complicated.
> -        ['chromeos==0 and host_arch=="x64"', {
> -          'linux_use_gold_binary%': 1,
> -        }, {
> -          'linux_use_gold_binary%': 0,
> -        }],
>       ],
>     },
>
> @@ -443,7 +434,6 @@
>     'enable_web_intents%': '<(enable_web_intents)',
>     'enable_web_intents_tag%': '<(enable_web_intents_tag)',
>     'enable_plugin_installation%': '<(enable_plugin_installation)',
> -    'linux_use_gold_binary%': '<(linux_use_gold_binary)',
>     'use_canvas_skia_skia%': '<(use_canvas_skia_skia)',
>     # Whether to build for Wayland display server
>     'use_wayland%': 0,
> @@ -1991,19 +1981,6 @@
>             'defines': ['KEEP_SHADOW_STACKS'],
>             'cflags': ['-finstrument-functions'],
>           }],
> -          ['linux_use_gold_binary==1', {
> -            'variables': {
> -              # We pass the path to gold to the compiler.  gyp leaves
> -              # unspecified what the cwd is when running the compiler,
> -              # so the normal gyp path-munging fails us.  This hack
> -              # gets the right path.
> -              'gold_path': '<(PRODUCT_DIR)/../../third_party/gold',
> -            },
> -            'ldflags': [
> -              # Put our gold binary in the search path for the linker.
> -              '-B<(gold_path)',
> -            ],
> -          }],
>         ],
>       },
>     }],
> Index: tools/licenses.py
> ===================================================================
> --- tools/licenses.py   (revision 120396)
> +++ tools/licenses.py   (working copy)
> @@ -63,7 +63,6 @@
>     # Used for development and test, not in the shipping product.
>     os.path.join('third_party','bidichecker'),
>     os.path.join('third_party','cygwin'),
> -    os.path.join('third_party','gold'),
>     os.path.join('third_party','lighttpd'),
>     os.path.join('third_party','mingw-w64'),
>     os.path.join('third_party','pefile'),
>
>