From ec306e9244ffb5b6dfc82c0ef8a10be52d0e21e8 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 5 Aug 2017 20:12:57 -0500
Subject: Allow GITHASH to be set on the command line, to work around a yocto
 bug.

---
 scripts/make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/make.sh b/scripts/make.sh
index 9c22d4f4..4893e22f 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -67,7 +67,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.)
 
-GITHASH="$(git describe --tags --abbrev=12 2>/dev/null)"
+[ -z "$GITHASH" ] && GITHASH="$(git describe --tags --abbrev=12 2>/dev/null)"
 [ ! -z "$GITHASH" ] && GITHASH="-DTOYBOX_VERSION=\"$GITHASH\""
 TOYFILES="$($SED -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')"
 TOYFILES="$(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c)"
-- 
cgit v1.2.3