Merge pull request #45 from hlopko:fix_cc_configure
PiperOrigin-RevId: 278612577
Change-Id: I70ed5cfba7bc5c5ee5cb0db45e0f072a36a49cff
diff --git a/cc/private/toolchain/unix_cc_configure.bzl b/cc/private/toolchain/unix_cc_configure.bzl
index 707104e..cbe6f91 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
diff --git a/cc/repositories.bzl b/cc/repositories.bzl
index 4e1dd8f..5ddb373 100644
--- a/cc/repositories.bzl
+++ b/cc/repositories.bzl
@@ -24,7 +24,7 @@
)
def rules_cc_toolchains(*args):
- cc_configure(*args)
+ cc_configure(*args)
def _maybe(repo_rule, name, **kwargs):
if not native.existing_rule(name):
diff --git a/renovate.json b/renovate.json
index 35d60f6..ee8c906 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,5 @@
{
"extends": [
- "config:base",
- ],
+ "config:base"
+ ]
}
