[llvm-branch-commits] [llvm] release/20.x: workflows/release-binaries: Fix macos-14 build (#127157) (PR #128945)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Feb 26 13:37:19 PST 2025


https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/128945

Backport d595d5a770d93c9564268fc631d85f3a6ce1f505

Requested by: @tstellar

>From 77e6d0893b4b21a962d76f3f805ebb1b4691b0f3 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Fri, 14 Feb 2025 07:28:44 -0800
Subject: [PATCH] workflows/release-binaries: Fix macos-14 build (#127157)

This was broken when pgo was enabled by
0572580dd040a81dc69b798e202550d51d17204a.

(cherry picked from commit d595d5a770d93c9564268fc631d85f3a6ce1f505)
---
 .github/workflows/release-binaries.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"



More information about the llvm-branch-commits mailing list