commit f892322753c674460da0496d9e3bc818961e43d3
author Jon Chesterfield <jonathanchesterfield@gmail.com> Wed Mar 17 11:34:44 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Mar 18 05:46:17 2021 -0700
tree 07b0b7cef7f303603f8033e87fcbffcad7bca9eb
parent fcfb183094b063825df1487537ba52160a63884c

Revert "[libomptarget] Build amdgcn devicertl by default"

This reverts commit e23f3502d9a2b1e9abd445130a22cc00f6464da8.
It broke the build of openmp for clang built without amdgcn
support. D98746, under review, would allow this to reland.

GitOrigin-RevId: dbf8f2b089e842d445442a25a0aee78e3b3b500d

libomptarget/deviceRTLs/CMakeLists.txt

diff --git a/libomptarget/deviceRTLs/CMakeLists.txt b/libomptarget/deviceRTLs/CMakeLists.txt
index 8bbf987..3df94ea 100644
--- a/libomptarget/deviceRTLs/CMakeLists.txt
+++ b/libomptarget/deviceRTLs/CMakeLists.txt
@@ -10,5 +10,4 @@
 #
 ##===----------------------------------------------------------------------===##
 
-add_subdirectory(amdgcn)
 add_subdirectory(nvptx)

libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
index 361e052..8ba0572 100644
--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
@@ -154,6 +154,6 @@
   add_custom_target(lib${libname}-${mcpu} ALL DEPENDS ${bc_libname})
 
   install(FILES ${OUTPUTDIR}/${bc_libname}
-     DESTINATION "${OPENMP_INSTALL_LIBDIR}"
+     DESTINATION "${OPENMP_INSTALL_LIBDIR}/libdevice"
   )
 endforeach()