Skip to content

Commit e961023

Browse files
author
Siddhartha Bagaria
committed
Remove Makevars support
There is not enough customization to warrant keeping it in this repo where it is untested, does not fit well with multiple target toolchains, and does not have a clear use case.
1 parent 806346a commit e961023

File tree

4 files changed

+0
-55
lines changed

4 files changed

+0
-55
lines changed

toolchain/BUILD.toolchain.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ package(default_visibility = ["//visibility:public"])
1717
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
1818
load("%{cc_toolchain_config_bzl}", "cc_toolchain_config")
1919

20-
exports_files(["Makevars"])
21-
2220
# Following filegroup targets are used when not using absolute paths and shared
2321
# between different toolchains.
2422

toolchain/Makevars.tpl

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

toolchain/cc_toolchain_config.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ def cc_toolchain_config(
129129
link_libs = []
130130

131131
# Linker flags:
132-
# Keep this logic in sync with _makevars_ld_flags.
133132
if host_os == "darwin" and not is_xcompile:
134133
# lld is experimental for Mach-O, so we use the native ld64 linker.
135134
use_lld = False

toolchain/internal/configure.bzl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ load(
3030
)
3131
load("@rules_cc//cc:defs.bzl", _cc_toolchain = "cc_toolchain")
3232

33-
def _makevars_ld_flags(rctx, os):
34-
# Keep this logic in sync with cc_toolchain_config.
35-
36-
if os == "darwin":
37-
return ""
38-
39-
# lld, as of LLVM 7, is experimental for Mach-O, so we use it only on linux.
40-
return "-fuse-ld=lld"
41-
4233
def _include_dirs_str(rctx, key):
4334
dirs = rctx.attr.cxx_builtin_include_directories.get(key)
4435
if not dirs:
@@ -154,16 +145,6 @@ def llvm_register_toolchains():
154145
},
155146
)
156147

157-
# Make vars useful for languages that interface with C/C++ and use the 'make' system.
158-
rctx.template(
159-
"Makevars",
160-
Label("//toolchain:Makevars.tpl"),
161-
{
162-
"%{toolchain_path_prefix}": toolchain_path_prefix,
163-
"%{makevars_ld_flags}": _makevars_ld_flags(rctx, os),
164-
},
165-
)
166-
167148
def _cc_toolchains_str(workspace_name, toolchain_info, use_absolute_paths):
168149
# Since all the toolchains rely on downloading the right LLVM toolchain for
169150
# the host architecture, we don't need to explicitly specify

0 commit comments

Comments
 (0)