Skip to content

Commit 816fde1

Browse files
mgornytru
authored andcommitted
[clang] Install scan-build-py into plain "lib" directory (#106612)
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 (cherry picked from commit 0c4cf79)
1 parent c21b039 commit 816fde1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clang/tools/scan-build-py/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})
8888
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
8989
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
9090
install(FILES lib/libscanbuild/${lib}
91-
DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild
91+
DESTINATION lib/libscanbuild
9292
COMPONENT scan-build-py)
9393
endforeach()
9494

@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})
106106
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
107107
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
108108
install(FILES lib/libscanbuild/resources/${resource}
109-
DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources
109+
DESTINATION lib/libscanbuild/resources
110110
COMPONENT scan-build-py)
111111
endforeach()
112112

@@ -122,7 +122,7 @@ foreach(lib ${LibEar})
122122
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
123123
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
124124
install(FILES lib/libear/${lib}
125-
DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear
125+
DESTINATION lib/libear
126126
COMPONENT scan-build-py)
127127
endforeach()
128128

0 commit comments

Comments
 (0)