Skip to content

Conversation

@llvmbot
Copy link
Member

@llvmbot llvmbot commented Oct 30, 2025

Backport 21bcd00

Requested by: @brad0

@llvmbot
Copy link
Member Author

llvmbot commented Oct 30, 2025

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

@llvmbot llvmbot requested a review from DavidSpickett October 30, 2025 01:46
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Oct 30, 2025
@llvmbot
Copy link
Member Author

llvmbot commented Oct 30, 2025

@llvm/pr-subscribers-clang

Author: None (llvmbot)

Changes

Backport 21bcd00

Requested by: @brad0


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

1 Files Affected:

  • (modified) clang/tools/clang-shlib/CMakeLists.txt (+4)
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
index 945076e1ad810..a4d0aa5779a7e 100644
--- a/clang/tools/clang-shlib/CMakeLists.txt
+++ b/clang/tools/clang-shlib/CMakeLists.txt
@@ -41,6 +41,10 @@ if (CLANG_LINK_CLANG_DYLIB)
   set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN)
 endif()
 
+if (HAIKU)
+  list(APPEND _DEPS network)
+endif()
+
 add_clang_library(clang-cpp
                   SHARED
                   ${INSTALL_WITH_TOOLCHAIN}

@c-rhodes c-rhodes moved this from Needs Triage to Needs Review in LLVM Release Status Oct 30, 2025
Copy link
Collaborator

@DavidSpickett DavidSpickett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve of backporting this. Fixes the build on Haiku, does not impact anyone else.

@c-rhodes c-rhodes moved this from Needs Review to Needs Merge in LLVM Release Status Oct 31, 2025
Haiku requires linking in libnetwork.

Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
(cherry picked from commit 21bcd00)
@c-rhodes c-rhodes merged commit df3145b into llvm:release/21.x Oct 31, 2025
@github-project-automation github-project-automation bot moved this from Needs Merge to Done in LLVM Release Status Oct 31, 2025
@github-actions
Copy link

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

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