[Openmp-commits] [openmp] dbf8f2b - Revert "[libomptarget] Build amdgcn devicertl by default"

[Jon Chesterfield via Openmp-commits]

Author: Jon Chesterfield
Date: 2021-03-17T11:34:44Z
New Revision: dbf8f2b089e842d445442a25a0aee78e3b3b500d

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

LOG: 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.

Added: 
    

Modified: 
    openmp/libomptarget/deviceRTLs/CMakeLists.txt
    openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

Removed: 
    


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

diff  --git a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
index 361e052ef499..8ba057206b82 100644
--- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
+++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt
@@ -154,6 +154,6 @@ foreach(mcpu ${mcpus})
   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()