diff options
| author | fanquake <fanquake@gmail.com> | 2021-04-15 08:50:36 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-04-15 08:51:14 +0800 |
| commit | 7fcf53f7b4524572d1d0c9a5fdc388e87eb02416 (patch) | |
| tree | bb1ccb29e8a2fac36b59bd822baee1e5de14d85d | |
| parent | 773f8c1a7d568012768e16d2ede65b5d4d62aced (diff) | |
| parent | 09b3e468480538977d2844ba083c66197c9d1d08 (diff) | |
| download | bitcoin-7fcf53f7b4524572d1d0c9a5fdc388e87eb02416.tar.xz | |
Merge #21672: doc: remove boostrap info from GUIX_COMMON_FLAGS doc
09b3e468480538977d2844ba083c66197c9d1d08 doc: remove boostrap info from GUIX_COMMON_FLAGS doc (fanquake)
Pull request description:
Passing `ADDITIONAL_GUIX_COMMON_FLAGS="--no-substitutes --bootstrap"` as suggested doesn't work:
```bash
...outputting in: '/bitcoin/guix-build-a1f0b8b62eb8/output/x86_64-linux-gnu'
...bind-mounted in container to: '/outdir-base/x86_64-linux-gnu'
guix time-machine: error: bootstrap: unrecognized option
```
and I think bootstrapping is more than covered in the preceding "Choose your security model" section.
ACKs for top commit:
dongcarl:
ACK 09b3e468480538977d2844ba083c66197c9d1d08
jarolrod:
ACK 09b3e468480538977d2844ba083c66197c9d1d08
laanwj:
Documentation review ACK 09b3e468480538977d2844ba083c66197c9d1d08
Tree-SHA512: e533a0b925a2ec091884ec04313f56376b4e85f615c8853dd51840181493d61bd01fee1c019e34880c32d7896e4871ea77e63398ba02b022f614c03bb16531aa
| -rw-r--r-- | contrib/guix/README.md | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/guix/README.md b/contrib/guix/README.md index 8c7d6e90ca..dad7de32c4 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -205,10 +205,7 @@ find output/ -type f -print0 | sort -z | xargs -r0 sha256sum * _**ADDITIONAL_GUIX_COMMON_FLAGS**_ - Additional flags to be passed to all `guix` commands. For a fully-bootstrapped - build, set this to `--bootstrap --no-substitutes` (refer to the [security - model section](#choosing-your-security-model) for more details). Note that a - fully-bootstrapped build will take quite a long time on the first run. + Additional flags to be passed to all `guix` commands. * _**ADDITIONAL_GUIX_TIMEMACHINE_FLAGS**_ |