From 4580dfd96233380ecbe61869370501072a777bb5 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Wed, 18 Oct 2017 17:49:16 -0500
Subject: [PATCH 1/3] do not include -B/usr/bin

---
 tools/cpp/unix_cc_configure.bzl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
index 2056e5c41c..914aed84ff 100644
--- a/tools/cpp/unix_cc_configure.bzl
+++ b/tools/cpp/unix_cc_configure.bzl
@@ -283,7 +283,7 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin):
                 "-headerpad_max_install_names",
             ] if darwin else bin_search_flag + [
                 # Always have -B/usr/bin, see https://github.com/bazelbuild/bazel/issues/760.
-                "-B/usr/bin",
+                # "-B/usr/bin",
                 # Gold linker only? Can we enable this by default?
                 # "-Wl,--warn-execstack",
                 # "-Wl,--detect-odr-violations"
@@ -320,7 +320,7 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin):
             _add_compiler_option_if_supported(repository_ctx, cc, "-Wself-assign")
         ) if darwin else bin_search_flag + [
             # Always have -B/usr/bin, see https://github.com/bazelbuild/bazel/issues/760.
-            "-B/usr/bin",
+            # "-B/usr/bin",
         ]) + (
             # Disable problematic warnings.
             _add_compiler_option_if_supported(repository_ctx, cc, "-Wunused-but-set-parameter") +
-- 
2.17.0

