Remove CROSSTOOL

YinjieLin · Jul 27, 2018 · a2618a5 · a2618a5
1 parent 51a4ee8
commit a2618a5
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 1,912 deletions.
diff --git a/cmake/bazel.rc.in b/cmake/bazel.rc.in
@@ -6,7 +6,6 @@
 #     bazel --bazelrc=@CMAKE_CURRENT_BINARY_DIR@/bazel.rc <command> <options>
 
 build --compilation_mode=@BAZEL_COMPILATION_MODE@
-build --crosstool_top=@bazel_tools//tools/cpp:toolchain
 build --python_path=@PYTHON_EXECUTABLE@
 build --symlink_prefix=/
 

diff --git a/common/BUILD.bazel b/common/BUILD.bazel
@@ -657,9 +657,8 @@ sh_test(
         "drake_assert.h",
         "test/drake_assert_test_compile.cc",
         "unused.h",
-        "//third_party:com_github_bazelbuild_bazel/tools/cpp/osx_cc_wrapper.sh",  # noqa
-        "//tools/cc_toolchain:all_toolchain_deps",
         "//tools/cc_toolchain:capture_cc.env",
+        "//tools/cc_toolchain:toolchain_deps",
     ],
 )
 

diff --git a/common/test/drake_assert_test_compile_variants.sh b/common/test/drake_assert_test_compile_variants.sh
@@ -9,7 +9,7 @@ drake_assert_test_compile_cc="$2"
 # Make sure we know what C++ compiler to use.
 source "$capture_cc_env"
 [[ ! -z "$BAZEL_CC" ]]
-[[ -x "$BAZEL_CC" ]]
+command -v "$BAZEL_CC"
 "$BAZEL_CC" --version
 
 # TODO(#6996) Do this unconditionally once #6996 is fully merged.

diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel
@@ -4,15 +4,6 @@ load("//tools/lint:lint.bzl", "add_lint_tests")
 
 package(default_visibility = ["//visibility:public"])
 
-exports_files(
-    ["com_github_bazelbuild_bazel/tools/cpp/osx_cc_wrapper.sh"],
-    licenses = ["notice"],  # Apache-2.0
-    visibility = [
-        "//common:__pkg__",
-        "//tools/cc_toolchain:__pkg__",
-    ],
-)
-
 exports_files(
     ["net_sf_jchart2d/LICENSE"],
     licenses = ["restricted"],  # LGPL-3.0+

diff --git a/third_party/com_github_bazelbuild_bazel/LICENSE b/third_party/com_github_bazelbuild_bazel/LICENSE
diff --git a/third_party/com_github_bazelbuild_bazel/tools/cpp/osx_cc_wrapper.sh b/third_party/com_github_bazelbuild_bazel/tools/cpp/osx_cc_wrapper.sh
diff --git a/third_party/com_github_bazelbuild_bazel/vendor.txt b/third_party/com_github_bazelbuild_bazel/vendor.txt