Skip to content

Commit a94f317

Browse files
committed
build: adjust rpath, don't pass -F to the link
Pass the framework only to the importer as `-F` on ELF is used for the `DT_FILTER`. Adjust the `DT_RUNPATH` so that the dependent libraries are found.
1 parent 03c2ff4 commit a94f317

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

utils/build-script-impl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2991,13 +2991,14 @@ for host in "${ALL_HOSTS[@]}"; do
29912991
# This assumes that there are no spaces in any on these paths.
29922992
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
29932993
DOTEST_EXTRA="-I${FOUNDATION_BUILD_DIR}"
2994-
DOTEST_EXTRA="-F${FOUNDATION_BUILD_DIR}/CoreFoundation-prefix/System/Library/Frameworks"
2994+
DOTEST_EXTRA="-Xcc -F${FOUNDATION_BUILD_DIR}/CoreFoundation-prefix/System/Library/Frameworks"
29952995
DOTEST_EXTRA="${DOTEST_EXTRA} -I${FOUNDATION_BUILD_DIR}/swift"
29962996
DOTEST_EXTRA="${DOTEST_EXTRA} -I${LIBDISPATCH_SOURCE_DIR}"
29972997
DOTEST_EXTRA="${DOTEST_EXTRA} -L${FOUNDATION_BUILD_DIR}"
29982998
DOTEST_EXTRA="${DOTEST_EXTRA} -L${LIBDISPATCH_BUILD_DIR}"
29992999
DOTEST_EXTRA="${DOTEST_EXTRA} -L${LIBDISPATCH_BUILD_DIR}/src"
30003000
DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${LIBDISPATCH_BUILD_DIR}/src"
3001+
DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${LIBDISPATCH_BUILD_DIR}"
30013002
DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${FOUNDATION_BUILD_DIR}"
30023003
fi
30033004
call mkdir -p "${results_dir}"

0 commit comments

Comments
 (0)