guix/depends: cleanup

diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 1cfd7de27234d7ff3fae2d56dc2cb9bdc4a96ed8..15bbf1a86460ecce195bfe6306dc737cca2d71e1 100644 (file)
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -184,32 +184,6 @@ ifneq ($($(1)_ldflags),)
 $(1)_autoconf += LDFLAGS="$$($(1)_ldflags)"
 endif
 
-$(1)_autoconff=./configure --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)"
-ifneq ($($(1)_nm),)
-$(1)_autoconff += NM="$$($(1)_nm)"
-endif
-ifneq ($($(1)_ranlib),)
-$(1)_autoconff += RANLIB="$$($(1)_ranlib)"
-endif
-ifneq ($($(1)_ar),)
-$(1)_autoconff += AR="$$($(1)_ar)"
-endif
-ifneq ($($(1)_arflags),)
-$(1)_autoconff += ARFLAGS="$$($(1)_arflags)"
-endif
-ifneq ($($(1)_cflags),)
-$(1)_autoconff += CFLAGS="$$($(1)_cflags)"
-endif
-ifneq ($($(1)_cxxflags),)
-$(1)_autoconff += CXXFLAGS="$$($(1)_cxxflags)"
-endif
-ifneq ($($(1)_cppflags),)
-$(1)_autoconff += CPPFLAGS="$$($(1)_cppflags)"
-endif
-ifneq ($($(1)_ldflags),)
-$(1)_autoconff += LDFLAGS="$$($(1)_ldflags)"
-endif
-
 $(1)_cmake=env CC="$$($(1)_cc)" \
                CFLAGS="$$($(1)_cppflags) $$($(1)_cflags)" \
                CXX="$$($(1)_cxx)" \

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index 295902535f1caed659aaeeed6d7c40688556dcc9..5ed3278b12a561339373fabcf9ca477c0e8e2ec5 100755 (executable)
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -9,6 +9,9 @@ set -e -o pipefail
 # shellcheck source=libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
+###################
+## SANITY CHECKS ##
+###################
 
 ################
 # Required non-builtin commands should be invocable
@@ -70,7 +73,9 @@ mkdir -p "$VERSION_BASE"
 ################
 
 # Default to building for all supported HOSTs (overridable by environment)
-export HOSTS="${HOSTS:-x86_64-linux-gnu x86_64-linux-gnu.tails aarch64-linux-gnu arm-linux-gnueabihf x86_64-w64-mingw32 x86_64-w64-mingw32.installer x86_64-apple-darwin}"
+export HOSTS="${HOSTS:-x86_64-linux-gnu x86_64-linux-gnu.tails aarch64-linux-gnu arm-linux-gnueabihf
+                       x86_64-w64-mingw32 x86_64-w64-mingw32.installer
+                       x86_64-apple-darwin}"
 
 # Usage: distsrc_for_host HOST
 #