Minimal changes

Author: Meinersbur

.ci/compute-projects.sh

@@ -100,21 +100,11 @@ function add-dependencies() {
     compiler-rt|libc|openmp)
       echo clang lld
     ;;
-    lldb|libclc)
+    flang|lldb|libclc)
       for p in llvm clang; do
         echo $p
       done
     ;;
-    flang)
-      for p in llvm clang mlir; do
-        echo $p
-      done
-    ;;
-    flang-rt)
-      for p in llvm clang mlir flang; do
-        echo $p
-      done
-    ;;
     lld|mlir|polly)
       echo llvm
     ;;

.ci/generate-buildkite-pipeline-premerge

@@ -73,7 +73,7 @@ fi
 # needs while letting them run on the infrastructure provided by LLVM.
 
 # Figure out which projects need to be built on each platform
-all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang flang-rt libc libclc lld lldb llvm mlir openmp polly pstl"
+all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
 modified_projects="$(keep-modified-projects ${all_projects})"
 
 linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))

.ci/monolithic-linux.sh

@@ -82,9 +82,9 @@ if [[ "${runtimes}" != "" ]]; then
     exit 1
   fi
 
-  echo "--- ninja install-clang install-flang"
+  echo "--- ninja install-clang"
 
-  ninja -C ${BUILD_DIR} install-clang install-flang install-clang-resource-headers
+  ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
 
   RUNTIMES_BUILD_DIR="${MONOREPO_ROOT}/build-runtimes"
   INSTALL_DIR="${BUILD_DIR}/install"
@@ -95,7 +95,7 @@ if [[ "${runtimes}" != "" ]]; then
   cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
       -D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
       -D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-      -D CMAKE_Fortran_COMPILER="${INSTALL_DIR}/bin/flang" \
+      -D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
       -D CMAKE_Fortran_COMPILER_WORKS=ON \
       -D LLVM_ENABLE_RUNTIMES="${runtimes}" \
       -D LIBCXX_CXX_ABI=libcxxabi \