From 3c17e976b3b3f797dbf1993f31fd9b117bbb186b Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 23 Oct 2019 13:53:14 -0700 Subject: [PATCH] build: adjust rpath for new foundation layout This adjusts the encoded RPATH to enable us to switch to the new Foundation build. --- utils/build-script-impl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index b2cd5f56f5a31..71124c28d54a7 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2414,12 +2414,14 @@ for host in "${ALL_HOSTS[@]}"; do DOTEST_EXTRA="${DOTEST_EXTRA} -Xcc -F${FOUNDATION_BUILD_DIR}" DOTEST_EXTRA="${DOTEST_EXTRA} -I${FOUNDATION_BUILD_DIR}/swift" DOTEST_EXTRA="${DOTEST_EXTRA} -I${LIBDISPATCH_SOURCE_DIR}" - DOTEST_EXTRA="${DOTEST_EXTRA} -L${FOUNDATION_BUILD_DIR} -L${FOUNDATION_BUILD_DIR}/Foundation" DOTEST_EXTRA="${DOTEST_EXTRA} -L${LIBDISPATCH_BUILD_DIR}" DOTEST_EXTRA="${DOTEST_EXTRA} -L${LIBDISPATCH_BUILD_DIR}/src" - DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${LIBDISPATCH_BUILD_DIR}/src" + DOTEST_EXTRA="${DOTEST_EXTRA} -L${FOUNDATION_BUILD_DIR}" + DOTEST_EXTRA="${DOTEST_EXTRA} -L${FOUNDATION_BUILD_DIR}/Foundation" DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${LIBDISPATCH_BUILD_DIR}" + DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${LIBDISPATCH_BUILD_DIR}/src" DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${FOUNDATION_BUILD_DIR}" + DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${FOUNDATION_BUILD_DIR}/Foundation" fi # Watchpoint testing is currently disabled: see rdar://38566150.