commit 99a7a02b7bfbdc827837f5f0411dd7b7aba22c84
author Copybara-Service <copybara-worker@google.com> Tue Nov 05 03:22:24 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 05 03:22:24 2019 -0800
tree 9f4abde4bcf4a2ef5fbef9008b97648fed66a962
parent 5c0675a1366ba1a22be89c15e6b8e8759d6cc1fe
parent d978571909492462780903c556f783191a20142d

Merge pull request #46 from bazelbuild:hlopko-patch-2

PiperOrigin-RevId: 278581955
Change-Id: I2058d69e8e7c9418e5d9a773cbc056c3da1d9ec8

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