01/01: WIP: build fixes.

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 0db3aa0d2bee0cbbfe08b2c9c9109f1e859dabdb
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Jan 14 23:37:36 2019 +0100

    WIP: build fixes.
---
 gnu/packages/commencement.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 131fdf0..e1e6ecd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2584,7 +2584,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("make" ,make-mesboot0)
                       ("patch" ,patch-mesboot0)
                       ("sed" ,sed-mesboot0)
-                      ("tar" ,tar-mesboot0)
+                      ("tar" ,tar-mesboot)
 
                       ("gash" ,%bootstrap-gash+coreutils)
                       ("guile" ,%bootstrap-guile)
@@ -2605,6 +2605,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
                             "--disable-net-redirections"
                             "--disable-nls"
 
+                            "AWK=gawk"
+                            "LIBS=-lc -lnss_files -lnss_dns -lresolv"
+                            "gl_cv_func_rename_dest_works=yes"
                             ;; Pretend 'dlopen' is missing so we don't build 
loadable
                             ;; modules and related code.
                             "ac_cv_func_dlopen=no")
@@ -2616,12 +2619,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (substitute* "shell.c"
                 ((";;") ";"))
               #t))
-          (add-before 'configure 'setenv
-           (lambda _
-             (setenv "AWK" "gawk")
-             (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")
-             (setenv "gl_cv_func_rename_dest_works" "yes")
-             #t))
           (add-after 'configure 'configure-fixups
             (lambda _
               (let ((config.h (open-file "config.h" "a")))
@@ -3463,11 +3460,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("coreutils" ,coreutils-mesboot0)
                       ("diffutils" ,diffutils-mesboot0)
 
-                      ;;("gawk" ,gawk-seed)
-                      ;;("gawk" ,gawk-mesboot)
-                      ;; gawk-3.1.8 is still not good enough?
                       ("gawk" ,gawk-mesboot2)
-
                       ;; This error does not occur when using gawk-seed
                       ;; no error, but not good enough:
                       ;; checking for -z relro option... no