[llvm-branch-commits] [llvm] 40fd3f1 - Revert "[llvm-strings] Fix build linking against incorrect libiconv (#241766)"
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Thu Nov 12 02:28:28 PST 2026
Author: Harald van Dijk
Date: 2026-11-12T10:28:24Z
New Revision: 40fd3f196b5da6c7cf94f65e62e05c2e4bcf615a
URL: https://github.com/llvm/llvm-project/commit/40fd3f196b5da6c7cf94f65e62e05c2e4bcf615a
DIFF: https://github.com/llvm/llvm-project/commit/40fd3f196b5da6c7cf94f65e62e05c2e4bcf615a.diff
LOG: Revert "[llvm-strings] Fix build linking against incorrect libiconv (#241766)"
This reverts commit d5311d181267086e337e4dcf44630494f365140f.
Added:
Modified:
llvm/test/tools/llvm-strings/locale.test
llvm/tools/llvm-strings/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-strings/locale.test b/llvm/test/tools/llvm-strings/locale.test
index 1c9b43725c7fe..f3ed722b4133e 100644
--- a/llvm/test/tools/llvm-strings/locale.test
+++ b/llvm/test/tools/llvm-strings/locale.test
@@ -16,7 +16,7 @@ RUN: %if locale-en_US.UTF-8 %{ env LANG=en_US.UTF-8 \
RUN: llvm-strings -eS %t | FileCheck --match-full-lines --strict-whitespace --check-prefixes CHECK-IN-UTF-8 %s %} \
RUN: %else %{ echo en_US.UTF-8 locale not supported, skipping test %}
-RUN: %if locale-ja_JP.SJIS && !system-darwin %{ env LANG=ja_JP.SJIS \
+RUN: %if locale-ja_JP.SJIS %{ env LANG=ja_JP.SJIS \
RUN: llvm-strings -eS %t | FileCheck --match-full-lines --strict-whitespace --check-prefixes CHECK-IN-SJIS %s %} \
RUN: %else %{ echo ja_JP.SJIS locale not supported, skipping test %}
diff --git a/llvm/tools/llvm-strings/CMakeLists.txt b/llvm/tools/llvm-strings/CMakeLists.txt
index 6d43b2cd80bed..8dd98bdd2c8cb 100644
--- a/llvm/tools/llvm-strings/CMakeLists.txt
+++ b/llvm/tools/llvm-strings/CMakeLists.txt
@@ -16,8 +16,7 @@ add_llvm_tool(llvm-strings
)
if(APPLE)
- find_package(Iconv REQUIRED)
- target_link_libraries(llvm-strings PRIVATE Iconv::Iconv)
+ target_link_libraries(llvm-strings PRIVATE iconv)
endif()
if(LLVM_INSTALL_BINUTILS_SYMLINKS)
More information about the llvm-branch-commits
mailing list