Skip to content

[CMake][Release] Statically link ZSTD on all OSes #128554

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

tstellar
Copy link
Collaborator

This will make the binaries more portable.

This will make the binaries more portable.
@tstellar tstellar requested review from tru and keith February 24, 2025 19:18
@tstellar tstellar marked this pull request as ready for review February 24, 2025 19:18
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Feb 24, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 24, 2025

@llvm/pr-subscribers-clang

Author: Tom Stellard (tstellar)

Changes

This will make the binaries more portable.


Full diff: https://github.com/llvm/llvm-project/pull/128554.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)

@tstellar tstellar added this to the LLVM 20.X Release milestone Feb 26, 2025
@tstellar tstellar merged commit 0983277 into llvm:main Feb 26, 2025
28 of 32 checks passed
@tstellar
Copy link
Collaborator Author

/cherry-pick 0983277

@llvmbot
Copy link
Member

llvmbot commented Feb 26, 2025

/pull-request #128793

swift-ci pushed a commit to swiftlang/llvm-project that referenced this pull request Feb 26, 2025
This will make the binaries more portable.

(cherry picked from commit 0983277)
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