diff --git a/MODULE.bazel b/MODULE.bazel index bd817bce80..1369edde46 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -65,17 +65,6 @@ single_version_override( version = "3.8.2.bcr.7", ) -# tclZipfs.c's '#include "crypt.h"' picks up glibc's crypt.h instead of -# the vendored minizip one when glibc headers are explicit -isystem -# directories (hermetic-llvm zero-sysroot toolchain). Drop when fixed -# in a tcl_lang BCR release. -single_version_override( - module_name = "tcl_lang", - patch_strip = 1, - patches = [ - "//patches/tcl_lang:0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch", - ], -) bazel_dep(name = "openroad", dev_dependency = True) local_path_override( diff --git a/patches/tcl_lang/0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch b/patches/tcl_lang/0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch deleted file mode 100644 index 11bf1388c8..0000000000 --- a/patches/tcl_lang/0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -tclZipfs.c includes the vendored minizip crypt.h as #include "crypt.h", -relying on compat/zlib/contrib/minizip preceding any system directory -that also has a crypt.h. Hermetic toolchains that provide glibc headers -as explicit -isystem directories (e.g. the hermetic-llvm cc_toolchain) -search glibc's crypt.h (Unix password hashing) first, and the build -fails with implicit declarations of init_keys/decrypt_byte/zencode. -Include the intended header by its unambiguous path relative to the -compat/zlib include root instead. - ---- a/generic/tclZipfs.c -+++ b/generic/tclZipfs.c -@@ -75,7 +75,7 @@ - } while (0) - - #include "zlib.h" --#include "crypt.h" -+#include "contrib/minizip/crypt.h" - #include "zutil.h" - #include "crc32.h" -