Skip to content

Commit fe88983

Browse files
committed
Delete osx_cc_wrapper.sh
This was only used to fix the install_name of shared libraries, which is now obsolete since they are set correctly by the crosstool with `-install_name`.
1 parent 3483cfe commit fe88983

File tree

3 files changed

+4
-146
lines changed

3 files changed

+4
-146
lines changed

crosstool/BUILD.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ filegroup(
4646
filegroup(
4747
name = "tools",
4848
srcs = [
49-
"@build_bazel_apple_support//crosstool:exec_cc_wrapper",
5049
"@build_bazel_apple_support//crosstool:exec_libtool",
5150
"@build_bazel_apple_support//crosstool:exec_wrapped_clang",
5251
"@build_bazel_apple_support//crosstool:exec_wrapped_clang_pp",
@@ -81,7 +80,6 @@ filegroup(
8180
features = [
8281
%{features}
8382
],
84-
cc_wrapper = "@build_bazel_apple_support//crosstool:exec_cc_wrapper",
8583
cxx_builtin_include_directories = [
8684
%{cxx_builtin_include_directories}
8785
],

crosstool/cc_toolchain_config.bzl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
368368
],
369369
tools = [
370370
tool(
371-
tool = ctx.file.cc_wrapper,
371+
tool = ctx.file.wrapped_clang,
372372
execution_requirements = xcode_execution_requirements,
373373
),
374374
],
@@ -623,7 +623,7 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
623623
],
624624
tools = [
625625
tool(
626-
tool = ctx.file.cc_wrapper,
626+
tool = ctx.file.wrapped_clang,
627627
execution_requirements = xcode_execution_requirements,
628628
),
629629
],
@@ -690,7 +690,7 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
690690
],
691691
tools = [
692692
tool(
693-
tool = ctx.file.cc_wrapper,
693+
tool = ctx.file.wrapped_clang,
694694
execution_requirements = xcode_execution_requirements,
695695
),
696696
],
@@ -2780,7 +2780,7 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
27802780
"ar": ctx.file.libtool.path,
27812781
"cpp": "/usr/bin/cpp",
27822782
"dwp": "/usr/bin/dwp",
2783-
"gcc": ctx.file.cc_wrapper.path,
2783+
"gcc": ctx.file.wrapped_clang.path,
27842784
"gcov": "/usr/bin/gcov",
27852785
"ld": "/usr/bin/ld",
27862786
"nm": "/usr/bin/nm",
@@ -2816,10 +2816,6 @@ cc_toolchain_config = rule(
28162816
implementation = _impl,
28172817
attrs = {
28182818
"cpu": attr.string(mandatory = True),
2819-
"cc_wrapper": attr.label(
2820-
allow_single_file = True,
2821-
mandatory = True,
2822-
),
28232819
"cxx_builtin_include_directories": attr.string_list(),
28242820
"extra_env": attr.string_dict(),
28252821
"libtool": attr.label(

crosstool/osx_cc_wrapper.sh.tpl

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)