[clang] [llvm] Revert "workflows/release-binaries: Disable flang on Darwin (#164667)" (PR #216667)

[via cfe-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-github-workflow

Author: Tom Eccles (tblah)

<details>
<summary>Changes</summary>

This reverts commit 6d54a5e5b83ce3502b7a3488fea5afe1c8bf9c5c.

Flang Darwin builds were reverted due to #<!-- -->160546. That issue has not been reproducible (at least on my machine) for several months. There was a request for MacOS builds on the most recent flang community call.

Resolves #<!-- -->160546

---
Full diff: https://github.com/llvm/llvm-project/pull/216667.diff


2 Files Affected:

- (modified) .github/workflows/release-binaries.yml (+7) 
- (modified) clang/cmake/caches/Release.cmake (+2-8) 


``````````diff
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 36c04523fda06..4460ba5c3f75b 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -157,6 +157,13 @@ jobs:
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_COMPILER_RT_ENABLE_IOS=OFF"
           if [ "$RUNNER_ARCH" = "ARM64" ]; then
             arches=arm64
+          else
+            arches=x86_64
+            # Disable Flang builds on macOS x86_64.  The FortranLower library takes
+            # 2-3 hours to build on macOS, much slower than on Linux.
+            # The long build time causes the release build to time out on x86_64,
+            # so we need to disable flang there.
+            target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_PROJECTS='clang;lld;lldb;clang-tools-extra;polly;mlir'"
           fi
           target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_ARCHS=$arches -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_BUILTIN_ARCHS=$arches"
         fi
diff --git a/clang/cmake/caches/Release.cmake b/clang/cmake/caches/Release.cmake
index b0bc3ebfe5cb6..5bea5fa585fce 100644
--- a/clang/cmake/caches/Release.cmake
+++ b/clang/cmake/caches/Release.cmake
@@ -30,19 +30,13 @@ endfunction()
 #
 # cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake
 
-set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir")
+set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang")
 # bolt only supports ELF, so only enable it for Linux.
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND DEFAULT_PROJECTS "bolt")
 endif()
 
-set (DEFAULT_RUNTIMES "compiler-rt;libcxx;openmp")
-# Don't build flang on Darwin due to:
-# https://github.com/llvm/llvm-project/issues/160546
-if (NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
-  list(APPEND DEFAULT_PROJECTS "flang")
-  list(APPEND DEFAULT_RUNTIMES "flang-rt")
-endif()
+set (DEFAULT_RUNTIMES "compiler-rt;libcxx;openmp;flang-rt")
 
 if (NOT WIN32)
   list(APPEND DEFAULT_RUNTIMES "libcxxabi" "libunwind")

``````````

</details>


https://github.com/llvm/llvm-project/pull/216667