Skip to content

Revert "[libc][bazel] Support generating public libc headers in Bazel… #143001

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
Jun 5, 2025

Conversation

rupprecht
Copy link
Collaborator

… builds. (#141256)"

This reverts commit 27143f2. It causes some downstream failures when bootstrapping builds.

… builds. (llvm#141256)"

This reverts commit 27143f2. It causes some downstream failures when bootstrapping builds.
@rupprecht rupprecht requested a review from vonosmas June 5, 2025 16:22
@llvmbot llvmbot added libc bazel "Peripheral" support tier build system: utils/bazel labels Jun 5, 2025
@llvmbot
Copy link
Member

llvmbot commented Jun 5, 2025

@llvm/pr-subscribers-libc

Author: Jordan Rupprecht (rupprecht)

Changes

… builds. (#141256)"

This reverts commit 27143f2. It causes some downstream failures when bootstrapping builds.


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

4 Files Affected:

  • (modified) utils/bazel/WORKSPACE (-9)
  • (modified) utils/bazel/llvm-project-overlay/libc/BUILD.bazel (-9)
  • (modified) utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl (-23)
  • (removed) utils/bazel/third_party_build/pyyaml.BUILD (-16)
diff --git a/utils/bazel/WORKSPACE b/utils/bazel/WORKSPACE
index c21812ef2363b..84e65e6f67b5a 100644
--- a/utils/bazel/WORKSPACE
+++ b/utils/bazel/WORKSPACE
@@ -182,15 +182,6 @@ maybe(
     url = "https://github.com/wjakob/nanobind/archive/refs/tags/v2.4.0.tar.gz",
 )
 
-maybe(
-    http_archive,
-    name = "pyyaml",
-    build_file = "@llvm-raw//utils/bazel/third_party_build:pyyaml.BUILD",
-    sha256 = "f0a35d7f282a6d6b1a4f3f3965ef5c124e30ed27a0088efb97c0977268fd671f",
-    strip_prefix = "pyyaml-5.1/lib3",
-    url = "https://github.com/yaml/pyyaml/archive/refs/tags/5.1.zip",
-)
-
 load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
 
 py_repositories()
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index eb0f12dcab7e7..aa7f0a9389405 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -9,7 +9,6 @@ load("@rules_python//python:defs.bzl", "py_binary")
 load(
     ":libc_build_rules.bzl",
     "libc_function",
-    "libc_generated_header",
     "libc_header_library",
     "libc_math_function",
     "libc_support_library",
@@ -89,14 +88,6 @@ py_binary(
     srcs = glob(["utils/hdrgen/hdrgen/**/*.py"]),
     imports = ["utils/hdrgen"],
     main = "utils/hdrgen/hdrgen/main.py",
-    deps = ["@pyyaml//:yaml"],
-)
-
-libc_generated_header(
-    name = "include_stdbit_h",
-    hdr = "include/stdbit.h",
-    other_srcs = ["include/stdbit.h.def"],
-    yaml_template = "include/stdbit.yaml",
 )
 
 # Library containing all headers that can be transitively included by generated llvm-libc
diff --git a/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl b/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
index 9c9cbdcce756c..7fe263ab08f71 100644
--- a/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
@@ -248,29 +248,6 @@ def libc_header_library(name, hdrs, deps = [], **kwargs):
         **kwargs
     )
 
-def libc_generated_header(name, hdr, yaml_template, other_srcs = []):
-    """Generates a libc header file from YAML template.
-
-    Args:
-      name: Name of the genrule target.
-      hdr: Path of the header file to generate.
-      yaml_template: Path of the YAML template file.
-      other_srcs: Other files required to generate the header, if any.
-    """
-    hdrgen = "//libc:hdrgen"
-    cmd = "$(location {hdrgen}) $(location {yaml}) -o $@".format(
-        hdrgen = hdrgen,
-        yaml = yaml_template,
-    )
-
-    native.genrule(
-        name = name,
-        outs = [hdr],
-        srcs = [yaml_template] + other_srcs,
-        cmd = cmd,
-        tools = [hdrgen],
-    )
-
 def libc_math_function(
         name,
         additional_deps = None):
diff --git a/utils/bazel/third_party_build/pyyaml.BUILD b/utils/bazel/third_party_build/pyyaml.BUILD
deleted file mode 100644
index 78261a7f60d9b..0000000000000
--- a/utils/bazel/third_party_build/pyyaml.BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is licensed under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-load("@rules_python//python:defs.bzl", "py_library")
-
-package(
-    default_visibility = ["//visibility:public"],
-    # BSD/MIT-like license (for PyYAML)
-    licenses = ["notice"],
-)
-
-py_library(
-    name = "yaml",
-    srcs = glob(["yaml/*.py"]),
-)

@rupprecht rupprecht merged commit 578c75e into llvm:main Jun 5, 2025
9 of 12 checks passed
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.

2 participants