Moving binutils version extraction so it works with clang.

Moving binutils version extraction so it works with clang.

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

[mithro-old, 2014-03-18 15:53:17]

Hi guys,

Another Debug Fission related patch. I was sure this worked previously, but it
appears not.

Tim

[Nico, 2014-03-18 16:00:20]

lgtm

Sorry, should've caught this :-/

https://codereview.chromium.org/199333007/diff/20001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/199333007/diff/20001/build/common.gypi#newcod...
build/common.gypi:3104: ['linux_use_gold_flags==1 and (clang==1 or
gcc_version>=47) and binutils_version>=223', {
This still says 47 – probably just some old base version of this file?

[mithro-old, 2014-03-18 16:06:23]

https://codereview.chromium.org/199333007/diff/20001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/199333007/diff/20001/build/common.gypi#newcod...
build/common.gypi:3104: ['linux_use_gold_flags==1 and (clang==1 or
gcc_version>=47) and binutils_version>=223', {
On 2014/03/18 16:00:21, Nico (on GMT time Mar 15 - 24) wrote:
> This still says 47 – probably just some old base version of this file?

Yeah, just an old base version. Got too many of these changes outstanding at the
moment.

[mithro-old, 2014-03-18 17:05:09]

The CQ bit was checked by mithro@mithis.com

[commit-bot: I haz the power, 2014-03-18 17:18:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mithro@mithis.com/199333007/20001

[commit-bot: I haz the power, 2014-03-18 18:46:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 18:46:50]

Retried try job too often on mac_rel for step(s) telemetry_perf_unittests,
telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Lei Zhang, 2014-03-18 19:02:15]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-03-18 19:19:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mithro@mithis.com/199333007/20001

[commit-bot: I haz the power, 2014-03-18 19:20:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 19:20:06]

Failed to apply patch for build/common.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/common.gypi
  Hunk #1 FAILED at 1308.
  Hunk #2 succeeded at 1361 (offset 6 lines).
  1 out of 2 hunks FAILED -- saving rejects to file build/common.gypi.rej

Patch:       build/common.gypi
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index
1dc3dcd6d8bc7594c0e782b0dea0abc119a894d5..c5e84b2ea5a8c1bbf624f64eff7b94bac0051fb9
100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1308,15 +1308,12 @@
           ['OS=="android"', {
             # We directly set the gcc_version since we know what we use.
             'gcc_version%': 46,
-            'binutils_version%': 222,
           }, {
             'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
-            'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py
assembler)',
           }],
         ],
       }, {
         'gcc_version%': 0,
-        'binutils_version%': 0,
       }],
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py
<(windows_sdk_default_path))"=="True"', {
         'windows_sdk_path%': '<(windows_sdk_default_path)',
@@ -1355,7 +1352,14 @@
             # can use breakpad for these builds.
             'release_unwind_tables%': 0,
           }],
+          ['OS=="android"', {
+            'binutils_version%': 222,
+          }, {
+            'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py
assembler)',
+          }],
         ],
+      }, {
+        'binutils_version%': 0,
       }],  # os_posix==1 and OS!="mac" and OS!="ios"
       ['OS=="ios"', {
         'disable_nacl%': 1,

[mithro-old, 2014-03-19 03:17:35]

The CQ bit was checked by mithro@mithis.com

[commit-bot: I haz the power, 2014-03-19 03:17:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mithro@mithis.com/199333007/60001

[commit-bot: I haz the power, 2014-03-19 03:20:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 03:20:58]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_clang_dbg

[mithro-old, 2014-03-19 04:10:12]

The CQ bit was checked by mithro@mithis.com

[commit-bot: I haz the power, 2014-03-19 04:10:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mithro@mithis.com/199333007/60001

[commit-bot: I haz the power, 2014-03-19 12:01:58]

Change committed as 257943

[pneubeck (no reviews), 2014-03-19 13:08:19]

A revert of this CL has been created in
https://codereview.chromium.org/203603009/ by pneubeck@chromium.org.

The reason for reverting is: Seems to break runhooks on several bots, like:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%2BLSan%20Bu...

Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit
status 1 in /b/build/slave/Linux_ASan_LSan_Builder/build
Updating projects from gyp files...
/bin/sh: 1: clang++: not found
compiler_version.py failed to execute: clang++ -Xassembler --version -x
assembler -c /dev/null
Command 'clang++ -Xassembler --version -x assembler -c /dev/null' returned
non-zero exit status 127
gyp: Call to 'python ../build/compiler_version.py assembler' returned exit
status 1..