[PATCH] D112322: [libunwind] Fix path to libunwind for per-target-runtime-dir builds

[Louis Dionne via Phabricator via llvm-commits]

ldionne created this revision.
Herald added a project: libunwind.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libunwind.
ldionne requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

I believe this is what caused the revert of 5a8ad80b6fa5 <https://reviews.llvm.org/rG5a8ad80b6fa5cbad58b78384f534b78fca863e7f>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D112322

Files:
  libunwind/test/configs/llvm-libunwind-shared.cfg.in
  libunwind/test/configs/llvm-libunwind-static.cfg.in


Index: libunwind/test/configs/llvm-libunwind-static.cfg.in
===================================================================
--- libunwind/test/configs/llvm-libunwind-static.cfg.in
+++ libunwind/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@')
Index: libunwind/test/configs/llvm-libunwind-shared.cfg.in
===================================================================
--- libunwind/test/configs/llvm-libunwind-shared.cfg.in
+++ libunwind/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@')


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D112322.381571.patch
Type: text/x-patch
Size: 1536 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211022/633d65a4/attachment.bin>