Skip to content

release/20.x: [CMake][Release] Statically link ZSTD on all OSes (#128554) #128793

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

Merged
merged 1 commit into from
Feb 26, 2025

Conversation

llvmbot
Copy link
Member

@llvmbot llvmbot commented Feb 26, 2025

Backport 0983277

Requested by: @tstellar

@llvmbot llvmbot added this to the LLVM 20.X Release milestone Feb 26, 2025
@llvmbot
Copy link
Member Author

llvmbot commented Feb 26, 2025

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

@llvmbot llvmbot requested a review from keith February 26, 2025 00:16
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Feb 26, 2025
@llvmbot
Copy link
Member Author

llvmbot commented Feb 26, 2025

@llvm/pr-subscribers-clang

Author: None (llvmbot)

Changes

Backport 0983277

Requested by: @tstellar


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

1 Files Affected:

  • (modified) clang/cmake/caches/Release.cmake (+1-3)
diff --git a/clang/cmake/caches/Release.cmake b/clang/cmake/caches/Release.cmake
index a1c68fc51dbd0..1500fe24fccd3 100644
--- a/clang/cmake/caches/Release.cmake
+++ b/clang/cmake/caches/Release.cmake
@@ -128,6 +128,4 @@ 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()
+set_final_stage_var(LLVM_USE_STATIC_ZSTD "ON" BOOL)

This will make the binaries more portable.

(cherry picked from commit 0983277)
@tstellar tstellar merged commit 560ac75 into llvm:release/20.x Feb 26, 2025
5 of 7 checks passed
Copy link

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

@keith
Copy link
Member

keith commented Feb 26, 2025

Seems good to me!

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.

3 participants