commit 5c0675a1366ba1a22be89c15e6b8e8759d6cc1fe
author Copybara-Service <copybara-worker@google.com> Tue Nov 05 03:21:47 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 05 03:21:47 2019 -0800
tree ef74b3e41ce245aa20b0018fa68fac81ae0fe28b
parent 252442d1330aa31f382e1496d22e2190b34c2d3c
parent 1f8a00e6b838bce28d22f33d5741df5d99d4dc62

Merge pull request #48 from hlopko:fix_gold

PiperOrigin-RevId: 278581858
Change-Id: Id8791b4b1405f5210cc60714ed8d77feddc800dd

cc/private/toolchain/unix_cc_configure.bzl

diff --git a/cc/private/toolchain/unix_cc_configure.bzl b/cc/private/toolchain/unix_cc_configure.bzl
index 856486e..124c8e2 100644
--- a/cc/private/toolchain/unix_cc_configure.bzl
+++ b/cc/private/toolchain/unix_cc_configure.bzl
@@ -209,6 +209,10 @@
         for flag in line.split(" "):
             if flag.find("gold") == -1:
                 continue
+            if flag.find("--enable-gold") > -1 or flag.find("--with-plugin-ld") > -1:
+                # skip build configuration options of gcc itself
+                # TODO(hlopko): Add redhat-like worker on the CI (#9392)
+                continue
 
             # flag is '-fuse-ld=gold' for GCC or "/usr/lib/ld.gold" for Clang
             # strip space, single quote, and double quotes