Skip to content

Commit 82f7b03

Browse files
committed
Reapply [test] [llvm-config] Assume unix style lib names on mingw targets
Assume the MSVC style naming only for "windows-msvc" targets. After the previous attempt, this was changed to use the host triple instead of the target. Differential Revision: https://reviews.llvm.org/D149998
1 parent 1ade6f3 commit 82f7b03

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

llvm/test/lit.cfg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,10 @@ def have_cxx_shared_library():
365365
if not config.target_triple.startswith(("nvptx", "xcore")):
366366
config.available_features.add('object-emission')
367367

368+
# Allow checking for specific details in the host triple
369+
if config.host_triple:
370+
config.available_features.add('host=%s' % config.host_triple)
371+
368372
if config.have_llvm_driver:
369373
config.available_features.add('llvm-driver')
370374

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s
22
REQUIRES: static-libs
3-
UNSUPPORTED: system-windows
3+
UNSUPPORTED: host={{.*-windows-msvc}}
44
CHECK: -l
55
CHECK-NOT: error
66
CHECK-NOT: warning

llvm/test/tools/llvm-config/system-libs.windows.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s
22
REQUIRES: static-libs
3-
REQUIRES: system-windows
3+
REQUIRES: host={{.*-windows-msvc}}
44
CHECK-NOT: -l
55
CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
66
CHECK-NOT: error

0 commit comments

Comments
 (0)