From 4d9c2a56a0c79aa7a9a017fec0c9e0dcf7e782ad Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 3 Mar 2022 02:45:35 -0600
Subject: [PATCH] Move config variables to configure.

---
 configure       | 2 ++
 scripts/make.sh | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index ec938271..89053d82 100755
--- a/configure
+++ b/configure
@@ -47,3 +47,5 @@ fi
 [ -z "$HOSTCC" ] && HOSTCC=cc
 
 [ -z "$GENERATED" ] && GENERATED=generated
+[ -z "$KCONFIG_CONFIG" ] && KCONFIG_CONFIG=.config
+[ -z "$OUTNAME" ] && OUTNAME=toybox"${TARGET:+-$TARGET}"
diff --git a/scripts/make.sh b/scripts/make.sh
index 52da6a37..f097717e 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -5,8 +5,6 @@
 set -o pipefail
 source scripts/portability.sh
 
-[ -z "$KCONFIG_CONFIG" ] && KCONFIG_CONFIG=.config
-[ -z "$OUTNAME" ] && OUTNAME=toybox"${TARGET:+-$TARGET}"
 UNSTRIPPED="generated/unstripped/$(basename "$OUTNAME")"
 
 # Default to running one more parallel cc instance than we have processors
@@ -59,8 +57,7 @@ fi
 # Extract a list of toys/*/*.c files to compile from the data in $KCONFIG_CONFIG
 # (First command names, then filenames with relevant {NEW,OLD}TOY() macro.)
 
-[ -d ".git" ] && GITHASH="$(git describe --tags --abbrev=12 2>/dev/null)"
-[ ! -z "$GITHASH" ] && GITHASH="-DTOYBOX_VERSION=\"$GITHASH\""
+[ -d ".git" ] && GITHASH="-DTOYBOX_VERSION=\"$(git describe --tags --abbrev=12 2>/dev/null)\""
 TOYFILES="$($SED -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')"
 TOYFILES="main.c $(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c | xargs)"
 BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE $GITHASH)"
-- 
2.39.2