Skip to content

Commit 99a3f05

Browse files
authored
Fix absolute symlink in clang-assertions-2.7.0 (#89)
1 parent ae4ad5a commit 99a3f05

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

build/build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ NINJA_TARGET_RUNTIMES=install-runtimes
1818
TAG=
1919
declare -a COMMITS_TO_CHERRYPICK
2020
declare -a PATCHES_TO_APPLY
21+
declare -a COMMITS_TO_CHERRYPICK_AFTER_PATCHES
2122

2223
case $VERSION in
2324
ce-trunk)
@@ -441,8 +442,9 @@ mlir-*)
441442

442443
if [[ $MAJOR -eq 2 && $MINOR -eq 7 ]]; then
443444
GCC_VERSION=4.4.7
444-
PATCHES_TO_APPLY+=("${ROOT}/patches/ce-clang-2.7-clang-symlink.patch")
445+
PATCHES_TO_APPLY+=("${ROOT}/patches/ce-clang-2.7-clang-symlink-prerequisite.patch")
445446
PATCHES_TO_APPLY+=("${ROOT}/patches/ce-clang-2.7-default-to-intel-asm-syntax.patch")
447+
COMMITS_TO_CHERRYPICK_AFTER_PATCHES+=("16d73f92161ae43828fd6dfaa3bb887058352bcb") # fix for clang++ symlink being absolute
446448
# Not adding LLVM tests ("check" target), because they expect AT&T syntax.
447449
NINJA_EXTRA_TARGETS_NO_FAIL+=("clang-test")
448450
fi
@@ -509,6 +511,13 @@ for PATCH_TO_APPLY in "${PATCHES_TO_APPLY[@]}"; do
509511
git -C "${ROOT}/llvm-project" apply "${PATCH_TO_APPLY}" -v
510512
done
511513

514+
for COMMIT_TO_CHERRYPICK in "${COMMITS_TO_CHERRYPICK_AFTER_PATCHES[@]}"; do
515+
# It was found out that --depth=1 is not enough sometimes,
516+
# so fetching with --depth=10 to ensure that cherry-pick succeeds.
517+
git -C "${ROOT}/llvm-project" fetch --depth=10 origin "${COMMIT_TO_CHERRYPICK}" -v
518+
git -C "${ROOT}/llvm-project" cherry-pick -n "${COMMIT_TO_CHERRYPICK}" -v
519+
done
520+
512521
# For older LLVM versions, merge runtime and projects
513522
# August 2021 is when bootstrapping become necessary, bootstrapping might have been supported previously a few years prior
514523
COMMIT_DATE=$(cd "${ROOT}/llvm-project/llvm" && git show -s --format=%ct HEAD)

0 commit comments

Comments
 (0)