Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit e6f39c8

Browse files
committed
[libunwind] Fix path to libunwind for per-target-runtime-dir builds
We recently introduced a from-scratch config to run the libunwind tests. However, that config was always looking for libunwind in <install>/lib, and never in <install>/<target>/lib, which is necessary for tests to work when the per-target-runtime-dir configuration is enabled. This commit fixes that. I believe this is what caused the CI failures we saw after 5a8ad80 and caused it to be reverted. Differential Revision: https://reviews.llvm.org/D112322
1 parent f2360e1 commit e6f39c8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

libunwind/test/configs/llvm-libunwind-shared.cfg.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ config.substitutions.append(('%{compile_flags}',
4747
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
4848
))
4949
config.substitutions.append(('%{link_flags}',
50-
'-nodefaultlibs -L {0}/lib -Wl,-rpath,{0}/lib -lunwind -ldl -lc {1}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
50+
'-nodefaultlibs -L {0} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
5151
))
5252
config.substitutions.append(('%{exec}',
5353
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')

libunwind/test/configs/llvm-libunwind-static.cfg.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ config.substitutions.append(('%{compile_flags}',
4949
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
5050
))
5151
config.substitutions.append(('%{link_flags}',
52-
'-nodefaultlibs {}/lib/libunwind.a -ldl -lc {}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
52+
'-nodefaultlibs {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
5353
))
5454
config.substitutions.append(('%{exec}',
5555
'{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')

0 commit comments

Comments
 (0)