- Notifications
You must be signed in to change notification settings - Fork14.5k
[sanitizer] Fix libcxx cache existence check in symbolizer build#149249
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
int-zjt wants to merge1 commit intollvm:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+1 −1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
@llvm/pr-subscribers-compiler-rt-sanitizer Author: None (int-zjt) ChangesThe script incorrectly checked ${LLVM_BUILD}/build.ninja to determine if cached libcxx is available, while it should be checking the actual libcxx build directory at ${LIBCXX_BUILD}/build.ninja. Full diff:https://github.com/llvm/llvm-project/pull/149249.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.shindex 4d435976d3a10..c16ced067d4df 100755--- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh+++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh@@ -87,7 +87,7 @@ AR="${AR}" CC="${CC}" CFLAGS="$FLAGS -Wno-deprecated-non-prototype" RANLIB=/bin/ make -j libz.a # Build and install libcxxabi and libcxx.-if [[ ! -f ${LLVM_BUILD}/build.ninja ]]; then+if [[ ! -f ${LIBCXX_BUILD}/build.ninja ]]; then rm -rf "${LIBCXX_BUILD}" "${LIBCXX_INSTALL}" mkdir -p ${LIBCXX_BUILD} ${LIBCXX_INSTALL} cd ${LIBCXX_BUILD} |
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The script incorrectly checked ${LLVM_BUILD}/build.ninja to determine if cached libcxx is available, while it should be checking the actual libcxx build directory at ${LIBCXX_BUILD}/build.ninja.