From 690e72201e3b370e355b29fb5482014492fd0636 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Sat, 13 Dec 2025 11:20:35 +0800
Subject: [PATCH] Revert "stdenvBootstrapTools: fix build by fetching pie fix
 commit"

Preparing to move this patch into regular gcc.

This reverts commit 200b5eb08af1d01145061e9c45bafa6d6db85f40.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index d9f968c84300..6a1507df734d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -47,21 +47,10 @@ rec {
     '';
   };
 
-  bootGCC =
-    (pkgs.gcc.cc.override {
-      enableLTO = false;
-      isl = null;
-    }).overrideAttrs
-      (old: {
-        patches = old.patches or [ ] ++ [
-          (pkgs.fetchpatch {
-            # c++tools: Don't check --enable-default-pie.
-            # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found
-            url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch";
-            hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds=";
-          })
-        ];
-      });
+  bootGCC = pkgs.gcc.cc.override {
+    enableLTO = false;
+    isl = null;
+  };
 
   bootBinutils = pkgs.binutils.bintools.override {
     withAllTargets = false;