diff options
| author | Carl Dong <contact@carldong.me> | 2019-07-12 11:42:36 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2019-07-12 11:42:36 -0400 |
| commit | cd3e947f50db7cfe05c05b368c25742193729a62 (patch) | |
| tree | 831c7bceeaa702cbbb2e6ce094d072637df78d2c /contrib/guix/guix-build.sh | |
| parent | 8dff3e48a9e03299468ed3b342642f01f70da9db (diff) | |
contrib: guix: Various improvements.
- Clearer and more accurate prose
- Pin `guix pull' to commit rather than branch
- Just use `use-module' instead of `define-module'
- Use `bash-minimal' instead of `bash'
- Remove unneeded `tcsh' from manifest
- Explicitly use `python-3.7'
- Add comments about how {native,cross}-toolchains are produced and
why
Diffstat (limited to 'contrib/guix/guix-build.sh')
| -rwxr-xr-x | contrib/guix/guix-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index 6ca4d45acf..f8ba8c7ed2 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -19,8 +19,8 @@ for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64- # Display proper warning when the user interrupts the build trap 'echo "** INT received while building ${host}, you may want to clean up the relevant output and distsrc-* directories before rebuilding"' INT - # Run the build script 'contrib/guix/build.sh' in the build container - # specified by 'contrib/guix/manifest.scm' + # Run the build script 'contrib/guix/libexec/build.sh' in the build + # container specified by 'contrib/guix/manifest.scm' # shellcheck disable=SC2086 guix environment --manifest="${PWD}/contrib/guix/manifest.scm" \ --container \ |