diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-10-30 20:50:26 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-10-30 20:50:26 +0800 |
| commit | eed588d9976367cac020d20de9a99d4bce0058b3 (patch) | |
| tree | 449db39e73ec90151ec279ed1b403b189cabc2a0 /tests/guix-environment.sh | |
| parent | 9fa8f436696598e783407b16f0e459791fdd9970 (diff) | |
| parent | b90e7e5d49e951a24f58d3cd29d37127982ef240 (diff) | |
| download | patches-eed588d9976367cac020d20de9a99d4bce0058b3.tar patches-eed588d9976367cac020d20de9a99d4bce0058b3.tar.gz | |
Merge branch 'master' into dbus-update
Diffstat (limited to 'tests/guix-environment.sh')
| -rw-r--r-- | tests/guix-environment.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index f91c78a801..49b3b1ccc3 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -97,4 +97,18 @@ then # Make sure the "debug" output is not listed. if grep -E "$make_boot0_debug" "$tmpdir/a"; then false; else true; fi + + # Compute the build environment for the initial GNU Make, but add in the + # bootstrap Guile as an ad-hoc addition. + guix environment -e '(@@ (gnu packages commencement) gnu-make-boot0)' \ + --ad-hoc guile-bootstrap --no-substitutes --search-paths \ + --pure > "$tmpdir/a" + + # Make sure the bootstrap binaries are all listed where they belong. + cat $tmpdir/a + grep -E '^export PATH=.*-bootstrap-binaries-0/bin' "$tmpdir/a" + grep -E '^export PATH=.*-guile-bootstrap-2.0/bin' "$tmpdir/a" + grep -E '^export CPATH=.*-gcc-bootstrap-0/include' "$tmpdir/a" + grep -E '^export CPATH=.*-glibc-bootstrap-0/include' "$tmpdir/a" + grep -E '^export LIBRARY_PATH=.*-glibc-bootstrap-0/lib' "$tmpdir/a" fi |