From 6cffad2c7d902087e90dde27a134dc401611e77b Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Sun, 25 Dec 2022 21:59:18 +0100
Subject: [PATCH] guix/depends: cleanup

---
 contrib/depends/funcs.mk | 26 --------------------------
 contrib/guix/guix-build  |  7 ++++++-
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 1cfd7de..15bbf1a 100644
--- 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 2959025..5ed3278 100755
--- 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
 #