lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #9131 from obsidiansystems/delete-bootstrap-script

Browse source 
Get rid of `bootstrap.sh`

(cherry picked from commit aaef47a08eaf54a8856dd25c784fd85d8d7b0e22)
Change-Id: I1a74bed0c23d6fda06d5dfd8ecad443b9122da12
This commit is contained in:
eldritch horrors 2024-03-04 04:11:30 +01:00
parent 6feba52008
commit da0aa66d98
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.sh
View file

@ -1,4 +0,0 @@
#! /bin/sh -e
rm -f aclocal.m4
mkdir -p config
exec autoreconf -vfi

6
doc/manual/src/contributing/hacking.md
View file

@ -42,8 +42,8 @@ $ nix develop .#native-clang11StdenvPackages
To build Nix itself in this shell: To build Nix itself in this shell:
```console ```console
[nix-shell]$ ./bootstrap.sh [nix-shell]$ autoreconfPhase
[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out [nix-shell]$ configurePhase
[nix-shell]$ make -j $NIX_BUILD_CORES [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: To build Nix itself in this shell:
```console ```console
[nix-shell]$ ./bootstrap.sh [nix-shell]$ autoreconfPhase
[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out [nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/outputs/out
[nix-shell]$ make -j $NIX_BUILD_CORES [nix-shell]$ make -j $NIX_BUILD_CORES
``` ```

2
doc/manual/src/installation/building-source.md
View file

@ -3,7 +3,7 @@
After cloning Nix's Git repository, issue the following commands: After cloning Nix's Git repository, issue the following commands:
```console ```console
$ ./bootstrap.sh $ autoreconf -vfi
$ ./configure options... $ ./configure options...
$ make $ make
$ make install $ make install

1
flake.nix
View file

@ -61,7 +61,6 @@
configureFiles = fileset.unions [ configureFiles = fileset.unions [
./.version ./.version
./bootstrap.sh
./configure.ac ./configure.ac
./m4 ./m4
# TODO: do we really need README.md? It doesn't seem used in the build. # TODO: do we really need README.md? It doesn't seem used in the build.