[libc] Update install directory for offloading versions of libraries (#83592)

jhuber6 · web-flow · commit 18d0d9b9b2e9 · 2024-03-01T10:48:32.000-06:00
Summary:
These currently go to `lib/`, but if the user has `lib/&lt;triple&gt;` they
should go there because it's always searched first.
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
@@ -232,7 +232,7 @@ else()
     set(LIBC_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
   endif()
   if(LIBC_TARGET_OS_IS_GPU)
-    set(LIBC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
+    set(LIBC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${LIBC_TARGET_TRIPLE})
   else()
     set(LIBC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
   endif()
diff --git a/libc/lib/CMakeLists.txt b/libc/lib/CMakeLists.txt
@@ -77,9 +77,13 @@ install(
 )
 
 if(LIBC_TARGET_OS_IS_GPU)
+  set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX})
+  if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
+    set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX}/${LLVM_HOST_TRIPLE})
+  endif()
   install(
     TARGETS ${added_gpu_archive_targets}
-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+    ARCHIVE DESTINATION ${gpu_install_dir}
     COMPONENT libc
   )
   foreach(file ${added_gpu_bitcode_targets})

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,13 @@ install(`
`77`	`77`	`)`
`78`	`78`
`79`	`79`	`if(LIBC_TARGET_OS_IS_GPU)`
	`80`	`+ set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX})`
	`81`	`+ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)`
	`82`	`+ set(gpu_install_dir lib${LLVM_LIBDIR_SUFFIX}/${LLVM_HOST_TRIPLE})`
	`83`	`+ endif()`
`80`	`84`	`install(`
`81`	`85`	`TARGETS ${added_gpu_archive_targets}`
`82`		`- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}`
	`86`	`+ ARCHIVE DESTINATION ${gpu_install_dir}`
`83`	`87`	`COMPONENT libc`
`84`	`88`	`)`
`85`	`89`	`foreach(file ${added_gpu_bitcode_targets})`