2 files changed, 0 insertions, 58 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 34720f4070c6..d39c67d5ef8c 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,4 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.7.8-dev-null.patch 1915 BLAKE2B db860ccdab29862922d08fd9af5426d04e8871b74c717efc2bcff1084e66f262be287ce8c3c6ce5c84dfd3c03457183dfe38bb77afe76be2f8edeb7e97e46822 SHA512 dece4fa910f2477fc481d974915b47928b130afcdc278b3b0fe5c71eb63f2c65e400e7d07826d42cf7086ff8e1a702b348557a7b96bbe22ce25113209e1dd2b6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
diff --git a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
deleted file mode 100644
index 389f9e3a1e2b..000000000000
--- a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/712080
-
-From 9a794689a8ba47e79c96d6c370976448b756973c Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Sun, 22 Mar 2020 14:30:23 +0100
-Subject: [PATCH] Disable hard link mode when the output object file is
- /dev/null
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When hard link mode is enabled, ccache ≥3.6 unlinks the output file
-before writing to it as a workaround for a bug in Clang (#331). This
-unfortunately means that /dev/null will be removed when building as root
-(don’t do that, BTW) with hard link mode enabled and /dev/null as the
-the output file. A similar problem exists if the dependency file is
-/dev/null, regardless of hard link mode.
-
-Fix this by not unlinking the output file if it’s /dev/null and by not
-copying files to /dev/null at all. (There is no need to handle other
-non-regular output files since /dev/null is the only allowed non-regular
-output file.)
-
-Fixes #564.
----
- src/ccache.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/ccache.c b/src/ccache.c
-index 6e9da51..b9bafac 100644
---- a/src/ccache.c
-+++ b/src/ccache.c
-@@ -1299,6 +1299,11 @@ move_file_to_cache_same_fs(const char *source, const char *dest)
- static void
- do_copy_or_link_file_from_cache(const char *source, const char *dest, bool copy)
- {
-+	if (str_eq(dest, "/dev/null")) {
-+		cc_log("Skipping copy from %s to %s", source, dest);
-+		return;
-+	}
-+
- 	int ret;
- 	bool do_link = !copy && conf->hard_link && !file_is_compressed(source);
- 	if (do_link) {
-@@ -1432,7 +1437,8 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
- 	args_add(args, "-o");
- 	args_add(args, output_obj);
- 
--	if (conf->hard_link) {
-+	if (conf->hard_link && !str_eq(output_obj, "/dev/null")) {
-+		// This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=39782.
- 		x_unlink(output_obj);
- 	}
- 
--- 
-2.26.0
-