https://github.com/keith updated https://github.com/llvm/llvm-project/pull/109909
>From 8c6c06d0df5a17fd2ff4915c3de63695c18cd8dc Mon Sep 17 00:00:00 2001 From: Keith Smiley <keithbsmi...@gmail.com> Date: Wed, 25 Sep 2024 05:38:04 +0000 Subject: [PATCH 1/4] workflows/release-binaries: Use static ZSTD on macOS On macOS the shared zstd library points to a homebrew install that isn't very stable for users. --- .github/workflows/release-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index 925912df6843e4..f284f04ece5b3d 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -126,7 +126,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_COMPILER_RT_ENABLE_IOS=OFF -DLLVM_USE_STATIC_ZSTD=ON" if [ "${{ runner.arch }}" = "ARM64" ]; then arches=arm64 else >From f84921590fd3ce32ae133612f7c3fc16adf22218 Mon Sep 17 00:00:00 2001 From: Keith Smiley <keithbsmi...@gmail.com> Date: Sat, 28 Sep 2024 09:11:30 -0700 Subject: [PATCH 2/4] Move to release.cmake --- .github/workflows/release-binaries.yml | 2 +- clang/cmake/caches/Release.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index f284f04ece5b3d..925912df6843e4 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -126,7 +126,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 -DLLVM_USE_STATIC_ZSTD=ON" + target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_COMPILER_RT_ENABLE_IOS=OFF" if [ "${{ runner.arch }}" = "ARM64" ]; then arches=arm64 else diff --git a/clang/cmake/caches/Release.cmake b/clang/cmake/caches/Release.cmake index c93ff40ff3ee48..52167181f595bd 100644 --- a/clang/cmake/caches/Release.cmake +++ b/clang/cmake/caches/Release.cmake @@ -109,3 +109,6 @@ set_final_stage_var(LLVM_ENABLE_PROJECTS "${LLVM_RELEASE_ENABLE_PROJECTS}" STRIN set_final_stage_var(CPACK_GENERATOR "TXZ" STRING) set_final_stage_var(CPACK_ARCHIVE_THREADS "0" STRING) +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set_final_stage_var(LLVM_USE_STATIC_ZSTD "ON" BOOL) +endif() >From 3398ee07c0cc571242f70589c3284fcc348068e1 Mon Sep 17 00:00:00 2001 From: Keith Smiley <keithbsmi...@gmail.com> Date: Sat, 28 Sep 2024 18:04:35 -0700 Subject: [PATCH 3/4] add test commit to trigger --- .github/workflows/release-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index 925912df6843e4..a494bcc31fae50 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -123,7 +123,7 @@ jobs: echo "enable-pgo=false" >> $GITHUB_OUTPUT target_cmake_flags="-DLLVM_RELEASE_ENABLE_PGO=OFF" # The macOS builds try to cross compile some libraries so we need to - # add extra CMake args to disable them. + # add extra CMake args to disable them. TODO Remove this comment # 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" >From c4f0368c87ef2c6005c3b27227a449a723604243 Mon Sep 17 00:00:00 2001 From: Keith Smiley <keithbsmi...@gmail.com> Date: Sun, 29 Sep 2024 12:24:23 -0700 Subject: [PATCH 4/4] Discard changes to .github/workflows/release-binaries.yml --- .github/workflows/release-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index a494bcc31fae50..925912df6843e4 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -123,7 +123,7 @@ jobs: echo "enable-pgo=false" >> $GITHUB_OUTPUT target_cmake_flags="-DLLVM_RELEASE_ENABLE_PGO=OFF" # The macOS builds try to cross compile some libraries so we need to - # add extra CMake args to disable them. TODO Remove this comment + # 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" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits