Skip to content

Commit 9b58b0c

Browse files
mati865mstorsjo
authored andcommitted
[LLD] Ignore ELF tests when ld.lld defaults to MinGW
Follow-up to D87418. Differential Revision: https://reviews.llvm.org/D88991
1 parent 9b2b327 commit 9b58b0c

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

lld/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/%(build_config)s"
77
llvm_canonicalize_cmake_booleans(
88
LLVM_ENABLE_ZLIB
99
LLVM_ENABLE_LIBXML2
10+
LLD_DEFAULT_LD_LLD_IS_MINGW
1011
)
1112

1213
configure_lit_site_cfg(

lld/test/lit.cfg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,7 @@
110110
sout, _ = tar_version.communicate()
111111
if 'GNU tar' in sout.decode():
112112
config.available_features.add('gnutar')
113+
114+
# ELF tests expect the default target for ld.lld to be ELF.
115+
if config.ld_lld_default_mingw:
116+
config.excludes.append('ELF')

lld/test/lit.site.cfg.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
1616
config.have_zlib = @LLVM_ENABLE_ZLIB@
1717
config.have_libxml2 = @LLVM_ENABLE_LIBXML2@
1818
config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@
19+
config.ld_lld_default_mingw = @LLD_DEFAULT_LD_LLD_IS_MINGW@
1920

2021
# Support substitution of the tools and libs dirs with user parameters. This is
2122
# used when we can't determine the tool dir at configuration time.

0 commit comments

Comments
 (0)