From da0aa66d98b8b46253dd968cfaae61d872569c9b Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Mon, 4 Mar 2024 04:11:30 +0100
Subject: [PATCH] Merge pull request #9131 from
 obsidiansystems/delete-bootstrap-script

Get rid of `bootstrap.sh`

(cherry picked from commit aaef47a08eaf54a8856dd25c784fd85d8d7b0e22)
Change-Id: I1a74bed0c23d6fda06d5dfd8ecad443b9122da12
---
 bootstrap.sh                                   | 4 ----
 doc/manual/src/contributing/hacking.md         | 6 +++---
 doc/manual/src/installation/building-source.md | 2 +-
 flake.nix                                      | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100755 bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index e3e259351..000000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh -e
-rm -f aclocal.m4
-mkdir -p config
-exec autoreconf -vfi
diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md
index 4b0a3a3e5..442a00c61 100644
--- a/doc/manual/src/contributing/hacking.md
+++ b/doc/manual/src/contributing/hacking.md
@@ -42,8 +42,8 @@ $ nix develop .#native-clang11StdenvPackages
 To build Nix itself in this shell:
 
 ```console
-[nix-shell]$ ./bootstrap.sh
-[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
+[nix-shell]$ autoreconfPhase
+[nix-shell]$ configurePhase
 [nix-shell]$ make -j $NIX_BUILD_CORES
 ```
 
@@ -86,7 +86,7 @@ $ nix-shell --attr devShells.x86_64-linux.native-clang11StdenvPackages
 To build Nix itself in this shell:
 
 ```console
-[nix-shell]$ ./bootstrap.sh
+[nix-shell]$ autoreconfPhase
 [nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
 [nix-shell]$ make -j $NIX_BUILD_CORES
 ```
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/src/installation/building-source.md
index ed1efffd8..7dad9805a 100644
--- a/doc/manual/src/installation/building-source.md
+++ b/doc/manual/src/installation/building-source.md
@@ -3,7 +3,7 @@
 After cloning Nix's Git repository, issue the following commands:
 
 ```console
-$ ./bootstrap.sh
+$ autoreconf -vfi
 $ ./configure options...
 $ make
 $ make install
diff --git a/flake.nix b/flake.nix
index bc14941fd..a22964023 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,6 @@
 
       configureFiles = fileset.unions [
         ./.version
-        ./bootstrap.sh
         ./configure.ac
         ./m4
         # TODO: do we really need README.md? It doesn't seem used in the build.