Skip to content

Commit

Permalink
[clang] Install scan-build-py into plain "lib" directory (#106612)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mgorny committed Aug 30, 2024
1 parent b0eefb4 commit 0c4cf79
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions clang/tools/scan-build-py/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand Down

0 comments on commit 0c4cf79

Please sign in to comment.