Skip to content

workflows/release-binaries: Use static ZSTD on macOS #110701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

keith
Copy link
Member

@keith keith commented Oct 1, 2024

On macOS the shared zstd library points to a homebrew install that isn't
very stable for users.

(cherry picked from commit 748f540)

@keith keith requested a review from tstellar October 1, 2024 17:07
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Oct 1, 2024
@llvmbot
Copy link
Member

llvmbot commented Oct 1, 2024

@llvm/pr-subscribers-clang

Author: Keith Smiley (keith)

Changes

On macOS the shared zstd library points to a homebrew install that isn't
very stable for users.

(cherry picked from commit 748f540)


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

1 Files Affected:

  • (modified) clang/cmake/caches/Release.cmake (+3)
diff --git a/clang/cmake/caches/Release.cmake b/clang/cmake/caches/Release.cmake
index 6d5f75ca0074ee..c4947bf453872b 100644
--- a/clang/cmake/caches/Release.cmake
+++ b/clang/cmake/caches/Release.cmake
@@ -101,3 +101,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_HOST_SYSTEM_NAME} MATCHES "Darwin")
+  set_final_stage_var(LLVM_USE_STATIC_ZSTD "ON" BOOL)
+endif()

@keith
Copy link
Member Author

keith commented Oct 2, 2024

Is the process for this that you will merge it at some point? Mainly wondering if I need to keep following it to make sure it makes it for the next one

@tstellar tstellar added this to the LLVM 19.X Release milestone Oct 3, 2024
@tstellar
Copy link
Collaborator

tstellar commented Oct 3, 2024

@keith I added this to the release milestone, so the release manager (@tru) will merge this before the next release.

@keith
Copy link
Member Author

keith commented Oct 3, 2024

Thanks!

On macOS the shared zstd library points to a homebrew install that isn't
very stable for users.

(cherry picked from commit 748f540)
@tru tru force-pushed the ks/workflows-release-binaries-use-static-zstd-on-macos branch from 303522f to 7b591d7 Compare October 11, 2024 06:00
@tru tru merged commit 7b591d7 into llvm:release/19.x Oct 11, 2024
8 of 10 checks passed
Copy link

@keith (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.

@keith keith deleted the ks/workflows-release-binaries-use-static-zstd-on-macos branch January 30, 2025 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
Development

Successfully merging this pull request may close these issues.

4 participants