Author: Louis Dionne Date: 2021-10-22T14:36:14-04:00 New Revision: e6f39c8b4891242c0d0d8e7a78041614d9bcdefc
URL: https://github.com/llvm/llvm-project/commit/e6f39c8b4891242c0d0d8e7a78041614d9bcdefc DIFF: https://github.com/llvm/llvm-project/commit/e6f39c8b4891242c0d0d8e7a78041614d9bcdefc.diff LOG: [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 Added: Modified: libunwind/test/configs/llvm-libunwind-shared.cfg.in libunwind/test/configs/llvm-libunwind-static.cfg.in Removed: ################################################################################ diff --git a/libunwind/test/configs/llvm-libunwind-shared.cfg.in b/libunwind/test/configs/llvm-libunwind-shared.cfg.in index 5ba78521709c..b60c9ffbf42d 100644 --- a/libunwind/test/configs/llvm-libunwind-shared.cfg.in +++ b/libunwind/test/configs/llvm-libunwind-shared.cfg.in @@ -47,7 +47,7 @@ config.substitutions.append(('%{compile_flags}', '-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@') diff --git a/libunwind/test/configs/llvm-libunwind-static.cfg.in b/libunwind/test/configs/llvm-libunwind-static.cfg.in index 6d3f4f0185e1..327f048b1e0f 100644 --- a/libunwind/test/configs/llvm-libunwind-static.cfg.in +++ b/libunwind/test/configs/llvm-libunwind-static.cfg.in @@ -49,7 +49,7 @@ config.substitutions.append(('%{compile_flags}', '-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@') _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
