Don't trust CMAKE_INSTALL_LIBDIR

Not used by compiler-rt either

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -68,7 +68,6 @@ include(GetToolchainDirs)
 include(FlangCommon)
 include(HandleCompilerRT)
 include(ExtendPath)
-include(GNUInstallDirs)
 
 
 ############################
@@ -110,9 +109,9 @@ else ()
   # be installed there using the same prefix. This is to not have a difference
   # between bootstrap and standalone runtimes builds.
   set(FLANG_RT_OUTPUT_RESOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-  set(FLANG_RT_INSTALL_RESOURCE_PATH "${CMAKE_INSTALL_LIBDIR}/clang/${LLVM_VERSION_MAJOR}")
+  set(FLANG_RT_INSTALL_RESOURCE_PATH "lib/clang/${LLVM_VERSION_MAJOR}")
 
-  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "${CMAKE_INSTALL_LIBDIR}")
+  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "lib")
 endif ()
 extend_path(FLANG_RT_INSTALL_RESOURCE_LIB_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_lib_subdir}")
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_DIR)

flang-rt/cmake/modules/GetToolchainDirs.cmake

@@ -6,8 +6,6 @@
 #
 #===------------------------------------------------------------------------===#
 
-include(GNUInstallDirs)
-
 
 # Determine the subdirectory relative to Clang's resource dir/sysroot where to
 # install target-specific libraries, to be found by Clang/Flang driver. This was
@@ -35,15 +33,15 @@ include(GNUInstallDirs)
 # ToolChain::getArchSpecificLibPaths(...).
 function (get_toolchain_library_subdir outvar)
   if (NOT APPLE)
-    set(outval "${CMAKE_INSTALL_LIBDIR}")
+    set(outval "lib")
   else ()
     # Required to be "darwin" for MachO toolchain.
     get_toolchain_os_dirname(os_dirname)
-    set(outval "${CMAKE_INSTALL_LIBDIR}/${os_dirname}")
+    set(outval "lib/${os_dirname}")
   endif ()
 
   get_toolchain_arch_dirname(arch_dirname)
-  set(outval "${CMAKE_INSTALL_LIBDIR}/${arch_dirname}")
+  set(outval "lib/${arch_dirname}")
 
   set(${outvar} "${outval}" PARENT_SCOPE)
 endfunction ()