[clang] Install scan-build-py into plain "lib" directory (#106608) #106612
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
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change.
mgorny
requested review from
MaskRay,
linsinan1995,
petrhosek,
serge-sans-paille and
thesamesam
|
@llvm/pr-subscribers-clang Author: Michał Górny (mgorny) ChangesInstall scan-build-py modules into the plain This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Full diff: https://github.com/llvm/llvm-project/pull/106612.diff 1 Files Affected:
diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
index 3aca22c0b0a8d3..9273eb5ed977e4 100644
--- a/clang/tools/scan-build-py/CMakeLists.txt
+++ b/clang/tools/scan-build-py/CMakeLists.txt
@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
install(FILES lib/libscanbuild/${lib}
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild
+ DESTINATION lib/libscanbuild
COMPONENT scan-build-py)
endforeach()
@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
install(FILES lib/libscanbuild/resources/${resource}
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources
+ DESTINATION lib/libscanbuild/resources
COMPONENT scan-build-py)
endforeach()
@@ -122,7 +122,7 @@ foreach(lib ${LibEar})
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
install(FILES lib/libear/${lib}
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear
+ DESTINATION lib/libear
COMPONENT scan-build-py)
endforeach()
|
serge-sans-paille
approved these changes
Aug 30, 2024
| list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) | ||
| install(FILES lib/libscanbuild/${lib} | ||
| DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild | ||
| DESTINATION lib/libscanbuild |
There was a problem hiding this comment.
so we're looking into ../lib, I agree with the patch, LGTM
mgorny
added a commit
that referenced
this pull request
Aug 30, 2024
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Fixes #106608
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Aug 31, 2024
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Fixes llvm#106608 (cherry picked from commit 0c4cf79)
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Sep 1, 2024
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Fixes llvm#106608 (cherry picked from commit 0c4cf79)
milkice233
pushed a commit
to fedora-riscv/llvm
that referenced
this pull request
Jan 22, 2025
llvm/llvm-project#106612 moved these from lib64 to lib, so look for them there.
justinkb
pushed a commit
to justinkb/llvm-project
that referenced
this pull request
Apr 14, 2025
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Fixes llvm#106608 (cherry picked from commit 0c4cf79)
justinkb
pushed a commit
to justinkb/llvm-project
that referenced
this pull request
Jun 18, 2025
Install scan-build-py modules into the plain `lib` directory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected by `intercept-build` executable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib. This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change. Fixes llvm#106608 (cherry picked from commit 0c4cf79)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Install scan-build-py modules into the plain
libdirectory, without LLVM_LIBDIR_SUFFIX appended, to match the path expected byintercept-buildexecutable. This fixes the program being unable to find its modules. Using unsuffixed path makes sense here, since Python modules are not subject to multilib.This change effectively reverts 1334e12. The commit in question changed the path without a clear justification ("does not respect the given prefix") and the Python code was never modified to actually work with the change.