commit 4c36031aeabbdd68b6b50d8af45089d2705f0790
author Louis Dionne <ldionne.2@gmail.com> Fri Oct 22 12:03:00 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Oct 22 11:40:36 2021 -0700
tree cb97f82e6ff51a97f4d236b3843c3d6872b1e53c
parent 64bdd30f0781e7ea367a6354da34d428e1bccb94

[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 5a8ad80b6fa5 and caused it to be reverted.

Differential Revision: https://reviews.llvm.org/D112322

GitOrigin-RevId: e6f39c8b4891242c0d0d8e7a78041614d9bcdefc

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

diff --git a/test/configs/llvm-libunwind-shared.cfg.in b/test/configs/llvm-libunwind-shared.cfg.in
index 5ba7852..b60c9ff 100644
--- a/test/configs/llvm-libunwind-shared.cfg.in
+++ b/test/configs/llvm-libunwind-shared.cfg.in
@@ -47,7 +47,7 @@
     '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nodefaultlibs -L {0}/lib -Wl,-rpath,{0}/lib -lunwind -ldl -lc {1}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
+    '-nodefaultlibs -L {0} -Wl,-rpath,{0} -lunwind -ldl -lc {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
 ))
 config.substitutions.append(('%{exec}',
     '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')

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

diff --git a/test/configs/llvm-libunwind-static.cfg.in b/test/configs/llvm-libunwind-static.cfg.in
index 6d3f4f0..327f048 100644
--- a/test/configs/llvm-libunwind-static.cfg.in
+++ b/test/configs/llvm-libunwind-static.cfg.in
@@ -49,7 +49,7 @@
     '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nodefaultlibs {}/lib/libunwind.a -ldl -lc {}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
+    '-nodefaultlibs {}/libunwind.a -ldl -lc {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags))
 ))
 config.substitutions.append(('%{exec}',
     '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')