From bb7191aa81b858e9c979556eca55a7bc0db2d87b Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 15 May 2020 12:13:48 -0400 Subject: [PATCH] [libc++] Segregate back-deployment dylibs into their own subdirectory Otherwise, specifying (for example) the libc++.dylib from macos10.13 but the libc++abi.dylib from macos10.12 would end up adding library paths for both the 10.12 and 10.13 dylibs, which would each contain a copy of both libc++abi.dylib and libc++.dylib. By using a separate directory for libc++.dylib and libc++abi.dylib, those do not conflict anymore. The back-deployment roots were updated to match this change. --- libcxx/utils/ci/macos-backdeployment.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh index ae3dfa8..8767f4b 100755 --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -135,9 +135,9 @@ if [[ ${PREVIOUS_DYLIBS_DIR} == "" ]]; then echo "@@@@@@" fi -LIBCXX_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/${DEPLOYMENT_TARGET}/libc++.dylib" -LIBCXXABI_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/${DEPLOYMENT_TARGET}/libc++abi.dylib" -LIBCXX_IN_SDK="${PREVIOUS_DYLIBS_DIR}/macOS/${MACOS_SDK_VERSION}/libc++.dylib" +LIBCXX_ROOT_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/libc++/${DEPLOYMENT_TARGET}" +LIBCXXABI_ROOT_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/libc++abi/${DEPLOYMENT_TARGET}" +LIBCXX_ROOT_IN_SDK="${PREVIOUS_DYLIBS_DIR}/macOS/libc++/${MACOS_SDK_VERSION}" # TODO: We need to also run the tests for libc++abi. echo "@@@ Running tests for libc++ @@@" @@ -146,8 +146,8 @@ echo "@@@ Running tests for libc++ @@@" --param=cxx_headers="${LLVM_INSTALL_DIR}/include/c++/v1" \ --param=std="${STD}" \ --param=platform="macosx${DEPLOYMENT_TARGET}" \ - --param=cxx_runtime_root="$(dirname "${LIBCXX_ON_DEPLOYMENT_TARGET}")" \ - --param=abi_library_path="$(dirname "${LIBCXXABI_ON_DEPLOYMENT_TARGET}")" \ - --param=use_system_cxx_lib="$(dirname "${LIBCXX_IN_SDK}")" \ + --param=cxx_runtime_root="${LIBCXX_ROOT_ON_DEPLOYMENT_TARGET}" \ + --param=abi_library_path="${LIBCXXABI_ROOT_ON_DEPLOYMENT_TARGET}" \ + --param=use_system_cxx_lib="${LIBCXX_ROOT_IN_SDK}" \ ${ADDITIONAL_LIT_ARGS} echo "@@@@@@" -- 2.7.4