[libcxx-commits] [libcxx] [libcxxabi] [libcxxabi][cmake] Account for LIBCXXABI_TARGET_SUBDIR in test config (PR #138527)

[Raul Tambre via libcxx-commits]

================
@@ -30,7 +30,7 @@ config.substitutions.append(('%{libcxx}', '@LIBCXXABI_LIBCXX_PATH@'))
 config.substitutions.append(('%{install-prefix}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@'))
 config.substitutions.append(('%{include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/include'))
 config.substitutions.append(('%{cxx-include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/@LIBCXXABI_INSTALL_INCLUDE_DIR@'))
-config.substitutions.append(('%{cxx-target-include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/include/%{triple}/c++/v1'))
+config.substitutions.append(('%{cxx-target-include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/@LIBCXXABI_INSTALL_INCLUDE_TARGET_DIR@'))
----------------
tambry wrote:

I could've also just replace `%{triple}` here with `LIBCXXABI_TARGET_SUBDIR` and removed the `unset()` for it in `libcxxabi/CMakeLists.txt`, but I decided to match the structure of libc++.

https://github.com/llvm/llvm-project/pull/138527