From a3be503eb991815f2e97edb95b87147a6c567220 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Thu, 9 Feb 2012 19:26:27 +0000 Subject: [PATCH] Build fix: no gold on any ChromeOS build. On a Google-internal ChromeOS builder make seems to exit with a failure code no error message I can identify. git-svn-id: http://src.chromium.org/svn/trunk/src/build@121264 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common.gypi b/common.gypi index 76614d450..a4631b760 100644 --- a/common.gypi +++ b/common.gypi @@ -389,18 +389,14 @@ # linux_use_gold_binary: whether to use the binary checked into # third_party/gold. - ['host_arch=="x64"', { - 'linux_use_gold_binary%': 1, - }, { - 'linux_use_gold_binary%': 0, - }], - # linux_use_gold_flags: whether to use build flags that rely on gold. # On by default for x64 Linux. Temporarily off for ChromeOS as # it failed on a buildbot. ['host_arch=="x64" and chromeos==0', { + 'linux_use_gold_binary%': 1, 'linux_use_gold_flags%': 1, }, { + 'linux_use_gold_binary%': 0, 'linux_use_gold_flags%': 0, }],