From 9dc18434f0f137859cb017f45b454470709d3f8e Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Sun, 12 Nov 2023 13:44:45 -0500
Subject: [PATCH] Upgrade zig, llvm 17.0.4

---
 WORKSPACE        | 10 ++++------
 zig_fstrip.patch | 12 ------------
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 zig_fstrip.patch

diff --git a/WORKSPACE b/WORKSPACE
index 88561e2..8a1a3a1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -16,9 +16,9 @@ http_archive(
     ],
 )
 
-LLVM_COMMIT = "888437e1b60011b8a375dd30928ec925b448da57"  # 17.0.3
+LLVM_COMMIT = "309d55140c46384b6de7a7573206cbeba3f7077f"  # 17.0.4
 
-LLVM_SHA256 = "7a118101891964893a34796aa00489c5c8fb3bb15a1427d51bc5017842675648"
+LLVM_SHA256 = "a24528bc46fb436cb5aa949ef38e0c90d60dbd88c22e7bd9c6d7020c789e28b0"
 
 http_archive(
     name = "llvm-raw",
@@ -76,7 +76,7 @@ maybe(
 ## END LLVM ##
 
 ## ZIG CC ##
-HERMETIC_CC_TOOLCHAIN_VERSION = "v2.1.2"
+HERMETIC_CC_TOOLCHAIN_VERSION = "v2.1.3"
 
 http_archive(
     name = "hermetic_cc_toolchain",
@@ -84,9 +84,7 @@ http_archive(
     # and the compilation slows down considerably. Reassess if we want this in the future.
     #patch_args = ["-p1"],
     #patches = ["//:zig_cc.patch"],
-    patch_args = ["-p1"],
-    patches = ["//:zig_fstrip.patch"],
-    sha256 = "28fc71b9b3191c312ee83faa1dc65b38eb70c3a57740368f7e7c7a49bedf3106",
+    sha256 = "a5caccbf6d86d4f60afd45b541a05ca4cc3f5f523aec7d3f7711e584600fb075",
     urls = [
         "https://mirror.bazel.build/github.com/uber/hermetic_cc_toolchain/releases/download/{0}/hermetic_cc_toolchain-{0}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
         "https://github.com/uber/hermetic_cc_toolchain/releases/download/{0}/hermetic_cc_toolchain-{0}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
diff --git a/zig_fstrip.patch b/zig_fstrip.patch
deleted file mode 100644
index 1030c06..0000000
--- a/zig_fstrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl
-index 0295cdb..a0b7c88 100644
---- a/toolchain/defs.bzl
-+++ b/toolchain/defs.bzl
-@@ -168,6 +168,7 @@ def _zig_repository_impl(repository_ctx):
-     compile_cmd = [
-         _paths_join("..", "zig"),
-         "build-exe",
-+        "-fstrip",
-         "-mcpu={}".format(_MCPU[host_platform]),
-         "-OReleaseSafe",
-         "zig-wrapper.zig",