summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2024-02-21 00:14:59 +0000
committerTom Stellard <tstellar@redhat.com>2024-02-20 21:14:50 -0800
commit6c90f8dd546334b01c9a86387950e8c72d459f1e (patch)
tree9a348d2f4d34dea712a0ecf0f916f80f0ede8c22
parent235306ba1f89eb1b9f9724edec5eacb295f8198f (diff)
Fix llvm-x86_64-debian-dylib buildbotllvmorg-18.1.0-rc3
This was broken by 91a384621e5b762d9c173ffd247cfeadd5f436a2. (cherry picked from commit ff4d6c64ee4269e4a9b67a4dae7e0b82ae1c3419)
-rw-r--r--llvm/test/lit.cfg.py7
-rw-r--r--llvm/test/lit.site.cfg.py.in2
2 files changed, 5 insertions, 4 deletions
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
index c6f9ee82e08c..74e7769a4805 100644
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -414,10 +414,11 @@ if config.link_llvm_dylib:
config.available_features.add("llvm-dylib")
config.substitutions.append(
(
+ # libLLVM.so.19.0git
"%llvmdylib",
- "{}/libLLVM-{}{}".format(
- config.llvm_shlib_dir, config.llvm_dylib_version, config.llvm_shlib_ext
- ),
+ "{}/libLLVM{}.{}".format(
+ config.llvm_shlib_dir, config.llvm_shlib_ext, config.llvm_dylib_version
+ )
)
)
diff --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in
index 1138b2ccf7bc..b6f255d472d1 100644
--- a/llvm/test/lit.site.cfg.py.in
+++ b/llvm/test/lit.site.cfg.py.in
@@ -44,7 +44,7 @@ config.build_examples = @LLVM_BUILD_EXAMPLES@
config.enable_threads = @LLVM_ENABLE_THREADS@
config.build_shared_libs = @BUILD_SHARED_LIBS@
config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
-config.llvm_dylib_version = "@LLVM_VERSION_MAJOR@@LLVM_VERSION_SUFFIX@"
+config.llvm_dylib_version = "@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@@LLVM_VERSION_SUFFIX@"
config.llvm_host_triple = '@LLVM_HOST_TRIPLE@'
config.host_arch = "@HOST_ARCH@"
config.have_opt_viewer_modules = @LLVM_HAVE_OPT_VIEWER_MODULES@