release/20.x: workflows/release-binaries: Fix macos-14 build (#127157)

[llvmbot]

Backport d595d5a

Requested by: @tstellar

[llvmbot]

@boomanaiden154 What do you think about merging this PR to the release branch?

[llvmbot]

@llvm/pr-subscribers-github-workflow

Author: None (llvmbot)

Changes

Backport d595d5a

Requested by: @tstellar

---

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

1 Files Affected:

• (modified) .github/workflows/release-binaries.yml (+2-2)

diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index a18f64d6bc226..231dd26e54ae0 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -133,7 +133,7 @@ jobs:
         # add extra CMake args to disable them.
         # See https://github.com/llvm/llvm-project/issues/99767
         if [ "$RUNNER_OS" = "macOS" ]; then
-          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_COMPILER_RT_ENABLE_IOS=OFF"
+          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_COMPILER_RT_ENABLE_IOS=OFF"
           if [ "$RUNNER_ARCH" = "ARM64" ]; then
             arches=arm64
           else
@@ -144,7 +144,7 @@ jobs:
             # 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_DARWIN_osx_ARCHS=$arches -DBOOTSTRAP_DARWIN_osx_BUILTIN_ARCHS=$arches"
+          target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_ARCHS=$arches -DBOOTSTRAP_BOOTSTRAP_DARWIN_osx_BUILTIN_ARCHS=$arches"
         fi
 
         build_flang="true"

[tstellar]

Does this need to be in 20.1.0 or could it wait until 20.1.1 ?

[boomanaiden154]

Does this need to be in 20.1.0 or could it wait until 20.1.1 ?

Is this a scripted message or something? I'm assuming what version this lands in would be your call.

[tstellar]

Does this need to be in 20.1.0 or could it wait until 20.1.1 ?

Is this a scripted message or something? I'm assuming what version this lands in would be your call.

Yeah, I put the message on all issues. I'll backport this one for 20.1.0.

[github-actions]

@tstellar (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.