Update rules flex/bison to latest. (#385)

Co-authored-by: Andre Brisco <andre.brisco@protonmail.com
hdl · Feb 28, 2025 · b3ade33 · b3ade33
1 parent 02ac9da
commit b3ade33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/dependency_support/com_github_westes_flex/com_github_westes_flex.bzl b/dependency_support/com_github_westes_flex/com_github_westes_flex.bzl
@@ -21,6 +21,6 @@ def com_github_westes_flex():
     maybe(
         http_archive,
         name = "rules_flex",
-        sha256 = "8929fedc40909d19a4b42548d0785f796c7677dcef8b5d1600b415e5a4a7749f",
-        urls = ["https://github.com/jmillikin/rules_flex/releases/download/v0.2.1/rules_flex-v0.2.1.tar.xz"],
+        sha256 = "04f709d84237b63b6f7dce17be69e460589e546fdc6caca924ed7e53de42a3a8",
+        urls = ["https://github.com/jmillikin/rules_flex/releases/download/v0.3.1/rules_flex-v0.3.1.tar.xz"],
     )
diff --git a/dependency_support/org_gnu_bison/bison_empty_glob.patch b/dependency_support/org_gnu_bison/bison_empty_glob.patch
diff --git a/dependency_support/org_gnu_bison/org_gnu_bison.bzl b/dependency_support/org_gnu_bison/org_gnu_bison.bzl
@@ -21,18 +21,13 @@ def org_gnu_bison():
     maybe(
         http_archive,
         name = "rules_m4",
-        sha256 = "10ce41f150ccfbfddc9d2394ee680eb984dc8a3dfea613afd013cfb22ea7445c",
-        urls = ["https://github.com/jmillikin/rules_m4/releases/download/v0.2.3/rules_m4-v0.2.3.tar.xz"],
+        sha256 = "e62cc7f358a2de3e6f30159039277e0dd58e2918d9769d1cb5a965f1c322e6cd",
+        urls = ["https://github.com/jmillikin/rules_m4/releases/download/v0.2.4/rules_m4-v0.2.4.tar.xz"],
     )
 
     maybe(
         http_archive,
         name = "rules_bison",
-        sha256 = "2279183430e438b2dc77cacd7b1dbb63438971b2411406570f1ddd920b7c9145",
-        urls = ["https://github.com/jmillikin/rules_bison/releases/download/v0.2.2/rules_bison-v0.2.2.tar.xz"],
-        patch_args = ["-p1"],
-        patches = [
-            # TODO(https://github.com/jmillikin/rules_bison/pull/14): Delete after this PR is merged
-            Label("//dependency_support/org_gnu_bison:bison_empty_glob.patch"),
-        ],
+        sha256 = "d3897d735c013c220fb6daefe8d46dc527a7756da9c2743951efac2f02da6d99",
+        urls = ["https://github.com/jmillikin/rules_bison/releases/download/v0.3.1/rules_bison-v0.3.1.tar.xz"],
     )
diff --git a/dependency_support/verilator/private/verilator_bisonpre.py b/dependency_support/verilator/private/verilator_bisonpre.py
@@ -1,13 +1,20 @@
 """A wrapper for bisonpre that reduces noise in console logs."""
 
+import os
 import subprocess
 import sys
 
 
 def main() -> None:
     """The main entrypoint"""
+
+    env = dict(os.environ)
+    if "RUNFILES_DIR" in env:
+        del env["RUNFILES_DIR"]
+
     result = subprocess.run(
         [sys.executable] + sys.argv[1:],
+        env=env,
         check=False,
         stderr=subprocess.STDOUT,
         stdout=subprocess.PIPE,