6 changes: 1 addition & 5 deletions llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import("//llvm/lib/Target/targets_string.gni")
import("//llvm/utils/gn/build/buildflags.gni")
import("//llvm/utils/gn/build/libs/pthread/enable.gni")
import("//llvm/utils/gn/build/libs/terminfo/enable.gni")
import("//llvm/utils/gn/build/libs/xml/enable.gni")
import("//llvm/utils/gn/build/libs/zlib/enable.gni")
import("//llvm/utils/gn/build/write_cmake_config.gni")
Expand Down Expand Up @@ -36,7 +35,7 @@ write_cmake_config("BuildVariables.inc") {
lib = ""
}

# Windows doesn't use any of libxml2, terminfo, zlib by default.
# Windows doesn't use any of libxml2, zlib by default.
# Make GN not warn about these variables being unused.
not_needed([
"l",
Expand All @@ -63,9 +62,6 @@ write_cmake_config("BuildVariables.inc") {
if (llvm_enable_libxml2) {
system_libs += " ${l}xml2${lib}"
}
if (llvm_enable_terminfo) {
system_libs += " ${l}ncurses${lib}"
}
if (llvm_enable_zlib) {
system_libs += " ${l}z${lib}"
}
Expand Down
3 changes: 0 additions & 3 deletions utils/bazel/.bazelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ build --experimental_cc_shared_library
build:zlib_external --repo_env=BAZEL_LLVM_ZLIB_STRATEGY=external
build:zlib_system --repo_env=BAZEL_LLVM_ZLIB_STRATEGY=system

build:terminfo_external --repo_env=BAZEL_LLVM_TERMINFO_STRATEGY=external
build:terminfo_system --repo_env=BAZEL_LLVM_TERMINFO_STRATEGY=system

###############################################################################
# Options for "generic_clang" builds: these options should generally apply to
# builds using a Clang-based compiler, and default to the `clang` executable on
Expand Down
3 changes: 0 additions & 3 deletions utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,6 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

/* Define if the setupterm() function is supported this platform. */
/* LLVM_ENABLE_TERMINFO defined in Bazel */

/* Define to 1 if you have the <termios.h> header file. */
#define HAVE_TERMIOS_H 1

Expand Down
3 changes: 0 additions & 3 deletions utils/bazel/llvm_configs/config.h.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,6 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#cmakedefine HAVE_SYS_TYPES_H ${HAVE_SYS_TYPES_H}

/* Define if the setupterm() function is supported this platform. */
#cmakedefine LLVM_ENABLE_TERMINFO ${LLVM_ENABLE_TERMINFO}

/* Define to 1 if you have the <termios.h> header file. */
#cmakedefine HAVE_TERMIOS_H ${HAVE_TERMIOS_H}

Expand Down