Skip to content

Update the libc BUILD.bazel file with selects for Windows builds. #131172

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 3 commits into from
Mar 13, 2025

Conversation

bashi-bazouk
Copy link
Contributor

The Windows toolchain needs to build libc targets in order to support libc++. Currently, some targets fail to resolve, due to non-exhaustive select statements, not accounting for Windows builds.

This change adds clauses to select statements so that Windows builds can proceed.

Additionally, __support_osutil_exit, is configured to pass nothing to srcs for non-Linux builds. __support_osutil_exit is unconditionally included in the transitive dependencies of extern_libc_shared.

The Windows toolchain needs to build libc targets in order to support libc++. Currently, some targets fail to resolve, due to non-exhaustive select statements, not accounting for Windows builds.

This change adds clauses to select statements so that Windows builds can proceed.

Additionally, `__support_osutil_exit`, is configured to pass nothing to `srcs` for non-Linux builds. `__support_osutil_exit `is unconditionally included in the transitive dependencies of `extern_libc_shared`.
Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added libc bazel "Peripheral" support tier build system: utils/bazel labels Mar 13, 2025
@llvmbot
Copy link
Member

llvmbot commented Mar 13, 2025

@llvm/pr-subscribers-libc

Author: Brian Ledger (bashi-bazouk)

Changes

The Windows toolchain needs to build libc targets in order to support libc++. Currently, some targets fail to resolve, due to non-exhaustive select statements, not accounting for Windows builds.

This change adds clauses to select statements so that Windows builds can proceed.

Additionally, __support_osutil_exit, is configured to pass nothing to srcs for non-Linux builds. __support_osutil_exit is unconditionally included in the transitive dependencies of extern_libc_shared.


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

1 Files Affected:

  • (modified) utils/bazel/llvm-project-overlay/libc/BUILD.bazel (+6-1)
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 757db65ca8a77..25a9736b3671e 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -1319,6 +1319,7 @@ libc_support_library(
             "src/__support/OSUtil/linux/aarch64/syscall.h",
             "src/__support/OSUtil/linux/x86_64/syscall.h",
         ],
+	"@platforms//os:windows": [],
     }),
     deps = [
         ":__support_common",
@@ -1360,6 +1361,7 @@ libc_support_library(
     textual_hdrs = select({
         "@platforms//os:macos": ["src/__support/OSUtil/darwin/io.h"],
         "@platforms//os:linux": ["src/__support/OSUtil/linux/io.h"],
+	"@platforms//os:windows": ["src/__support/OSUtil/windows/io.h"],
     }),
     deps = [
         ":__support_common",
@@ -1371,7 +1373,10 @@ libc_support_library(
 
 libc_support_library(
     name = "__support_osutil_exit",
-    srcs = ["src/__support/OSUtil/linux/exit.cpp"],
+    srcs = select({
+        "@platforms//os:linux": ["src/__support/OSUtil/linux/exit.cpp"],
+	"//condition:default": [],
+    }),
     hdrs = ["src/__support/OSUtil/exit.h"],
     target_compatible_with = select({
         "@platforms//os:linux": [],

Copy link
Contributor

@vonosmas vonosmas left a comment

Choose a reason for hiding this comment

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

LGTM. Let us know if you'd like to get it merged.

@rupprecht rupprecht merged commit 4bcf1e6 into llvm:main Mar 13, 2025
7 of 9 checks passed
Copy link

@bashi-bazouk Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

frederik-h pushed a commit to frederik-h/llvm-project that referenced this pull request Mar 18, 2025
…vm#131172)

The Windows toolchain needs to build libc targets in order to support
libc++. Currently, some targets fail to resolve, due to non-exhaustive
select statements, not accounting for Windows builds.

This change adds clauses to select statements so that Windows builds can
proceed.

Additionally, `__support_osutil_exit`, is configured to pass nothing to
`srcs` for non-Linux builds. `__support_osutil_exit `is unconditionally
included in the transitive dependencies of `extern_libc_shared`.

---------

Co-authored-by: Brian Ledger <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bazel "Peripheral" support tier build system: utils/bazel libc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants