[clang] 1334e12 - [cmake] Append CLANG_LIBDIR_SUFFIX to scan-build-py installation destination

Chuanqi Xu via cfe-commits cfe-commits at lists.llvm.org
Fri Sep 2 01:19:01 PDT 2022


Author: Sinan Lin
Date: 2022-09-02T16:18:15+08:00
New Revision: 1334e129a39cb427e7b855e9a711a3e7604e50e5

URL: https://github.com/llvm/llvm-project/commit/1334e129a39cb427e7b855e9a711a3e7604e50e5
DIFF: https://github.com/llvm/llvm-project/commit/1334e129a39cb427e7b855e9a711a3e7604e50e5.diff

LOG: [cmake] Append CLANG_LIBDIR_SUFFIX to scan-build-py installation destination

met this issue when building llvm with config LLVM_LIBDIR_SUFFIX=64, and
the installation destination of scan-build-py does not respect the given
suffix.

Reviewed By: phosek

Differential Revision: https://reviews.llvm.org/D133160

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
index 061dc7ef4dd9e..a087f87974cb8 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(PROGRAMS lib/libscanbuild/${lib}
-          DESTINATION lib/libscanbuild
+          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/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(PROGRAMS lib/libscanbuild/resources/${resource}
-          DESTINATION lib/libscanbuild/resources
+          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/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(PROGRAMS lib/libear/${lib}
-          DESTINATION lib/libear
+          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear
           COMPONENT scan-build-py)
 endforeach()
 


        


More information about the cfe-commits mailing list