Generate gccbuiltins headers as part of root CMakeLists.txt

Even though they are header files they are tied to the version of llvm
ldc2 is being built against. Their generation script depends on llvm.
They are missing when building the runtime and the compiler
separately.

For these reasons build and install them as part of the ldc2 compiler.

Signed-off-by: Andrei Horodniceanu <[email protected]>

Author: the-horo

CMakeLists.txt

@@ -890,6 +890,44 @@ add_subdirectory(utils)
 #
 add_subdirectory(tools)
 
+#
+# GCC builtins.
+#
+if(TARGET gen_gccbuiltins)
+  set(build_import_dir "${PROJECT_BINARY_DIR}/runtime/import")
+
+  file(MAKE_DIRECTORY "${build_import_dir}/ldc")
+
+  function(gen_gccbuiltins name)
+    set(module "${build_import_dir}/ldc/gccbuiltins_${name}.di")
+    list(APPEND gccbuiltins "${module}")
+    set(gccbuiltins "${gccbuiltins}" PARENT_SCOPE)
+    add_custom_command(
+        OUTPUT ${module}
+        COMMAND gen_gccbuiltins ${module} "${name}"
+        DEPENDS gen_gccbuiltins
+    )
+  endfunction()
+
+  set(target_arch "AArch64;AMDGPU;ARM;Mips;RISCV;NVPTX;PowerPC;SystemZ;X86")
+  set(target_name "aarch64;amdgcn;arm;mips;riscv;nvvm;ppc;s390;x86")
+
+  foreach(target ${LLVM_TARGETS_TO_BUILD})
+    list(FIND target_arch ${target} idx)
+    if(idx GREATER -1)
+      list(GET target_name ${idx} name)
+      gen_gccbuiltins(${name})
+    endif()
+  endforeach()
+  makeConfSection(NAME "35-ldc-compiler-gccbuiltins" SECTION "default"
+      BUILD POST_SWITCHES "-I${build_import_dir}"
+  )
+  add_custom_target(gen_gccbuiltins_headers DEPENDS ${gccbuiltins})
+  add_dependencies(${LDC_EXE} gen_gccbuiltins_headers)
+
+  install(FILES ${gccbuiltins} DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
+endif()
+
 #
 # Compiler ldc2.conf configuration
 #

cmake/Modules/LdcCommon.cmake

@@ -270,6 +270,7 @@ endif()
 
 set(CONF_INST_DIR ${SYSCONF_INSTALL_DIR} CACHE PATH "Directory ldc.conf is installed to")
 option(CONF_PREFER_DIR "Prefer installing ldc2.conf as a directory")
+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/d CACHE PATH "Path to install D modules to")
 
 defineIfUnset(LDC2_BUILD_CONF "${CMAKE_BINARY_DIR}/bin/ldc2.conf")
 defineIfUnset(LDC2_INSTALL_CONF "${CMAKE_BINARY_DIR}/bin/ldc2_install.conf")

runtime/CMakeLists.txt

@@ -24,7 +24,6 @@ endif()
 
 set(MULTILIB              OFF                                 CACHE BOOL   "Build both 32/64 bit runtime libraries")
 set(BUILD_LTO_LIBS        OFF                                 CACHE BOOL   "Also build the runtime as LLVM bitcode libraries for LTO")
-set(INCLUDE_INSTALL_DIR   ${CMAKE_INSTALL_PREFIX}/include/d   CACHE PATH   "Path to install D modules to")
 set(BUILD_SHARED_LIBS     AUTO                                CACHE STRING "Whether to build the runtime as a shared library (ON|OFF|BOTH)")
 set(D_FLAGS               -w;-de;-preview=dip1000;-preview=dtorfields;-preview=fieldwise CACHE STRING "Runtime D compiler flags, separated by ';'")
 set(D_EXTRA_FLAGS         ""                                  CACHE STRING "Runtime extra D compiler flags, separated by ';'")
@@ -373,36 +372,6 @@ endif()
 # druntime/Phobos compilation helpers.
 #
 
-set(GCCBUILTINS "")
-if(TARGET gen_gccbuiltins)
-  file(MAKE_DIRECTORY "${LDC_BUILD_IMPORT_DIR}/ldc")
-
-  function(gen_gccbuiltins name)
-    set(module "${LDC_BUILD_IMPORT_DIR}/ldc/gccbuiltins_${name}.di")
-    if (GCCBUILTINS STREQUAL "")
-      set(GCCBUILTINS "${module}" PARENT_SCOPE)
-    else()
-      set(GCCBUILTINS "${GCCBUILTINS};${module}" PARENT_SCOPE)
-    endif()
-    add_custom_command(
-        OUTPUT ${module}
-        COMMAND gen_gccbuiltins ${module} "${name}"
-        DEPENDS gen_gccbuiltins
-    )
-  endfunction()
-
-  set(target_arch "AArch64;AMDGPU;ARM;Mips;RISCV;NVPTX;PowerPC;SystemZ;X86")
-  set(target_name "aarch64;amdgcn;arm;mips;riscv;nvvm;ppc;s390;x86")
-
-  foreach(target ${LLVM_TARGETS_TO_BUILD})
-    list(FIND target_arch ${target} idx)
-    if(idx GREATER -1)
-      list(GET target_name ${idx} name)
-      gen_gccbuiltins(${name})
-    endif()
-  endforeach()
-endif()
-
 # Always build zlib and other C parts of the runtime in release mode, regardless
 # of what the user chose for LDC itself. Also add other C_FLAGS here.
 # 1) Set up CMAKE_C_FLAGS_RELEASE
@@ -453,7 +422,7 @@ macro(dc src_files src_basedir d_flags output_basedir emit_bc all_at_once single
 
     # dc_deps can only contain paths, otherwise cmake will ignore the dependency.
     # See: https://github.com/ldc-developers/ldc/pull/4743#issuecomment-2323156173
-    set(dc_deps ${LDC_EXE_FULL} ${GCCBUILTINS})
+    set(dc_deps ${LDC_EXE_FULL})
 
     set(relative_src_files "")
     set(new_o "")
@@ -911,7 +880,6 @@ if(PHOBOS2_DIR)
     install(DIRECTORY ${PHOBOS2_DIR}/std DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
     install(DIRECTORY ${PHOBOS2_DIR}/etc DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
 endif()
-install(FILES ${GCCBUILTINS} DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
 
 
 #