Skip to content

Commit 7b5d6cd

Browse files
committed
[bazel] Remove terminfo dependency
The only enabling configuration of this is irreproducible. Since terminfo doesn't provide essential functionality, remove it so that all external dependencies now follow the same config_setting pattern. This should be an NFC for most setups and all CI setups. Reviewed By: phosek, MaskRay Differential Revision: https://reviews.llvm.org/D151006
1 parent d2fddae commit 7b5d6cd

File tree

10 files changed

+0
-285
lines changed

10 files changed

+0
-285
lines changed

utils/bazel/WORKSPACE

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure")
2727

2828
llvm_configure(name = "llvm-project")
2929

30-
load("@llvm-raw//utils/bazel:terminfo.bzl", "llvm_terminfo_from_env")
31-
32-
maybe(
33-
llvm_terminfo_from_env,
34-
name = "llvm_terminfo",
35-
)
36-
3730
maybe(
3831
http_archive,
3932
name = "llvm_zlib",

utils/bazel/configure.bzl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"""Helper macros to configure the LLVM overlay project."""
66

77
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
8-
load(":terminfo.bzl", "llvm_terminfo_disable", "llvm_terminfo_system")
98

109
# Directory of overlay files relative to WORKSPACE
1110
DEFAULT_OVERLAY_PATH = "llvm-project-overlay"
@@ -173,15 +172,3 @@ llvm_configure = repository_rule(
173172
"targets": attr.string_list(default = DEFAULT_TARGETS),
174173
},
175174
)
176-
177-
def llvm_disable_optional_support_deps():
178-
maybe(
179-
llvm_terminfo_disable,
180-
name = "llvm_terminfo",
181-
)
182-
183-
def llvm_use_system_support_deps():
184-
maybe(
185-
llvm_terminfo_system,
186-
name = "llvm_terminfo",
187-
)

utils/bazel/deps_impl/BUILD.bazel

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

utils/bazel/deps_impl/terminfo_disable.BUILD

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

utils/bazel/deps_impl/terminfo_system.BUILD

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

utils/bazel/deps_impl/terminfo_test.c

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

utils/bazel/examples/http_archive/WORKSPACE

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,3 @@ http_archive(
3838
load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure", "llvm_disable_optional_support_deps")
3939

4040
llvm_configure(name = "llvm-project")
41-
42-
# Disables optional dependencies for Support like zlib and terminfo. You may
43-
# instead want to configure them using the macros in the corresponding bzl
44-
# files.
45-
llvm_disable_optional_support_deps()

utils/bazel/examples/submodule/WORKSPACE

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,3 @@ new_local_repository(
2727
load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure", "llvm_disable_optional_support_deps")
2828

2929
llvm_configure(name = "llvm-project")
30-
31-
# Disables optional dependencies for Support like zlib and terminfo. You may
32-
# instead want to configure them using the macros in the corresponding bzl
33-
# files.
34-
llvm_disable_optional_support_deps()

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,6 @@ cc_library(
274274
deps = [
275275
":config",
276276
":Demangle",
277-
# We unconditionally depend on the custom LLVM terminfo wrapper. This
278-
# will be an empty library unless terminfo is enabled, in which case it
279-
# will both provide the necessary dependencies and configuration
280-
# defines.
281-
"@llvm_terminfo//:terminfo",
282277
# We unconditionally depend on the custom LLVM zlib wrapper. This will
283278
# be an empty library unless zlib is enabled, in which case it will
284279
# both provide the necessary dependencies and configuration defines.

utils/bazel/terminfo.bzl

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

0 commit comments

Comments
 (0)