Skip to content

Commit 16859f1

Browse files
authored
[build-script] Fix e11e127 to handle Xcode-based builds (#25774)
Xcode puts the bin/ and lib/ directories in a subdirectory based on configuration; account for this when copying over compiler-rt for non-host Apple platforms using one of the existing helpers in build-script-impl. (cherry picked from commit b951eed)
1 parent c88203d commit 16859f1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build-script-impl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2931,8 +2931,8 @@ for host in "${ALL_HOSTS[@]}"; do
29312931
HOST_CXX_DIR=$(dirname "${HOST_CXX}")
29322932
HOST_CXX_BUILTINS_VERSION=$(ls "$HOST_CXX_DIR/../lib/clang" | awk '{print $0}')
29332933
HOST_CXX_BUILTINS_DIR="$HOST_CXX_DIR/../lib/clang/$HOST_CXX_BUILTINS_VERSION/lib/darwin"
2934-
DEST_CXX_BUILTINS_VERSION=$(ls "$llvm_build_dir/lib/clang" | awk '{print $0}')
2935-
DEST_BUILTINS_DIR="$llvm_build_dir/lib/clang/$DEST_CXX_BUILTINS_VERSION/lib/darwin"
2934+
DEST_CXX_BUILTINS_VERSION=$(ls "$(build_directory_bin ${host} llvm)/../lib/clang" | awk '{print $0}')
2935+
DEST_BUILTINS_DIR="$(build_directory_bin ${host} llvm)/../lib/clang/$DEST_CXX_BUILTINS_VERSION/lib/darwin"
29362936

29372937
if [ -d "$DEST_BUILTINS_DIR" ]; then
29382938
echo "copying compiler-rt embedded builtins into the local clang build directory $DEST_BUILTINS_DIR."

0 commit comments

Comments
 (0)