Skip to content

Commit 7c692f2

Browse files
authored
[build-script] Fix e11e127 to handle Xcode-based builds (#25769) (#25778)
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.
1 parent b495095 commit 7c692f2

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
@@ -3154,8 +3154,8 @@ for host in "${ALL_HOSTS[@]}"; do
31543154
HOST_CXX_DIR=$(dirname "${HOST_CXX}")
31553155
HOST_CXX_BUILTINS_VERSION=$(ls "$HOST_CXX_DIR/../lib/clang" | awk '{print $0}')
31563156
HOST_CXX_BUILTINS_DIR="$HOST_CXX_DIR/../lib/clang/$HOST_CXX_BUILTINS_VERSION/lib/darwin"
3157-
DEST_CXX_BUILTINS_VERSION=$(ls "$llvm_build_dir/lib/clang" | awk '{print $0}')
3158-
DEST_BUILTINS_DIR="$llvm_build_dir/lib/clang/$DEST_CXX_BUILTINS_VERSION/lib/darwin"
3157+
DEST_CXX_BUILTINS_VERSION=$(ls "$(build_directory_bin ${host} llvm)/../lib/clang" | awk '{print $0}')
3158+
DEST_BUILTINS_DIR="$(build_directory_bin ${host} llvm)/../lib/clang/$DEST_CXX_BUILTINS_VERSION/lib/darwin"
31593159

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

0 commit comments

Comments
 (0)