https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/164667
>From f8d20c83bb0f4cea6ae426975fc5ee378b6578b0 Mon Sep 17 00:00:00 2001 From: Tom Stellard <[email protected]> Date: Wed, 22 Oct 2025 10:24:13 -0700 Subject: [PATCH 1/2] workflows/release-binaries: Disable flang on Darwin The tests are failing due to https://github.com/llvm/llvm-project/issues/160546 --- .github/workflows/release-binaries.yml | 5 ----- clang/cmake/caches/Release.cmake | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index 3f2eb3a1d8ea8..fadada54d5ed9 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -132,11 +132,6 @@ jobs: 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 82bfdc0cfd565..79d684125707b 100644 --- a/clang/cmake/caches/Release.cmake +++ b/clang/cmake/caches/Release.cmake @@ -30,12 +30,18 @@ endfunction() # # cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake -set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang") +set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir") # bolt only supports ELF, so only enable it for Linux. if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") list(APPEND DEFAULT_PROJECTS "bolt") endif() +# 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_PROJECT "flang") +endif() + set (DEFAULT_RUNTIMES "compiler-rt;libcxx") if (NOT WIN32) list(APPEND DEFAULT_RUNTIMES "libcxxabi" "libunwind") >From c9c67a08c23e29c55bd4f6f3d58294cb7dd0e364 Mon Sep 17 00:00:00 2001 From: Tom Stellard <[email protected]> Date: Fri, 24 Oct 2025 11:35:21 -0700 Subject: [PATCH 2/2] Update clang/cmake/caches/Release.cmake Co-authored-by: Cullen Rhodes <[email protected]> --- clang/cmake/caches/Release.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/cmake/caches/Release.cmake b/clang/cmake/caches/Release.cmake index 79d684125707b..25f7970119d07 100644 --- a/clang/cmake/caches/Release.cmake +++ b/clang/cmake/caches/Release.cmake @@ -39,7 +39,7 @@ endif() # 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_PROJECT "flang") + list(APPEND DEFAULT_PROJECTS "flang") endif() set (DEFAULT_RUNTIMES "compiler-rt;libcxx") _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
