Skip to content

Commit 140e738

Browse files
tstellarc-rhodes
authored andcommitted
workflows/release-binaries: Disable flang on Darwin (llvm#164667)
The tests are failing due to llvm#160546 --------- Co-authored-by: Cullen Rhodes <[email protected]>
1 parent ebfeacd commit 140e738

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/release-binaries.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@ jobs:
132132
arches=arm64
133133
else
134134
arches=x86_64
135-
# Disable Flang builds on macOS x86_64. The FortranLower library takes
136-
# 2-3 hours to build on macOS, much slower than on Linux.
137-
# The long build time causes the release build to time out on x86_64,
138-
# so we need to disable flang there.
139-
target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_PROJECTS='clang;lld;lldb;clang-tools-extra;polly;mlir'"
140135
fi
141136
target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_ARCHS=$arches -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_BUILTIN_ARCHS=$arches"
142137
fi

clang/cmake/caches/Release.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ endfunction()
3030
#
3131
# cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake
3232

33-
set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang")
33+
set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir")
3434
# bolt only supports ELF, so only enable it for Linux.
3535
if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
3636
list(APPEND DEFAULT_PROJECTS "bolt")
3737
endif()
3838

39+
# Don't build flang on Darwin due to:
40+
# https://github.com/llvm/llvm-project/issues/160546
41+
if (NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
42+
list(APPEND DEFAULT_PROJECTS "flang")
43+
endif()
44+
3945
set (DEFAULT_RUNTIMES "compiler-rt;libcxx")
4046
if (NOT WIN32)
4147
list(APPEND DEFAULT_RUNTIMES "libcxxabi" "libunwind")

0 commit comments

Comments
 (0)