diff options
author | Aaron Siddhartha Mondal <aaron@tracemachina.com> | 2024-05-31 01:29:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-31 01:29:00 +0200 |
commit | 852aaf54071ad072335dcac57f544d4da34c875a (patch) | |
tree | 336d6d36f934c387a0384b5fe7bcf68104085c09 /utils | |
parent | d4ff9615a1531f4a466b7d1fb0f175e3ae489289 (diff) | |
download | llvm-852aaf54071ad072335dcac57f544d4da34c875a.zip llvm-852aaf54071ad072335dcac57f544d4da34c875a.tar.gz llvm-852aaf54071ad072335dcac57f544d4da34c875a.tar.bz2 |
Reapply "[Support] Remove terminfo dependency (#92865)" (#93889)
This reverts commit fe82a3da36196157c0caa1ef2505186782f750d1.
This broke LLDB on MacOS due to a missing symbol during linking.
The fix has been applied in c6c08eee37bada190bd1aa4593c88a5e2c8cdaac.
Original commit message:
The terminfo dependency introduces a significant nonhermeticity into the
build. It doesn't respect `--no-undefined-version` meaning that it's not
a dependency that can be built with Clang 17+. This forces maintainers
of source-based distributions to implement patches or ignore linker
errors.
Remove it to reduce the closure size and improve portability of
LLVM-based tools. Users can still use command line arguments to toggle
color support expliticly.
Fixes #75490
Closes #53294 #23355
Diffstat (limited to 'utils')
-rw-r--r-- | utils/bazel/.bazelrc | 3 | ||||
-rw-r--r-- | utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h | 3 | ||||
-rw-r--r-- | utils/bazel/llvm_configs/config.h.cmake | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/utils/bazel/.bazelrc b/utils/bazel/.bazelrc index 5a6d188..09111bc 100644 --- a/utils/bazel/.bazelrc +++ b/utils/bazel/.bazelrc @@ -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 diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h index e9385f4..a4fb47d 100644 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h @@ -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 diff --git a/utils/bazel/llvm_configs/config.h.cmake b/utils/bazel/llvm_configs/config.h.cmake index 977c182..ff30741 100644 --- a/utils/bazel/llvm_configs/config.h.cmake +++ b/utils/bazel/llvm_configs/config.h.cmake @@ -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} |