From abddc3bb40da525852b2add695d0cb30d12a999d Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 20 Sep 2019 14:38:52 -0500
Subject: ASAN=1 implies NOSTRIP=1, and don't say strip failed for NOSTRIP.

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

diff --git a/configure b/configure
index e386cc3a..4735a7e9 100755
--- a/configure
+++ b/configure
@@ -21,7 +21,7 @@ fi
 CFLAGS="$CFLAGS -funsigned-char"
 [ -z "$OPTIMIZE" ] && OPTIMIZE="-Os -ffunction-sections -fdata-sections -fno-asynchronous-unwind-tables -fno-strict-aliasing"
 # set ASAN=1 to enable "address sanitizer" and debuggable backtraces
-[ -z "$ASAN" ] || CFLAGS="$CFLAGS -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address"
+[ -z "$ASAN" ] || { CFLAGS="$CFLAGS -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address"; NOSTRIP=1; }
 
 # We accept LDFLAGS, but by default don't have anything in it
 if [ "$(uname)" != "Darwin" ]
@@ -39,3 +39,5 @@ fi
 # If HOSTCC needs CFLAGS or LDFLAGS, just add them to the variable
 # ala HOSTCC="blah-cc --static"
 [ -z "$HOSTCC" ] && HOSTCC=cc
+
+[ -z "$GENERATED" ] && GENERATED=generated
diff --git a/scripts/make.sh b/scripts/make.sh
index ec908ce1..538ba121 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -339,7 +339,7 @@ do_loudly $BUILD $LNKFILES $LINK || exit 1
 if [ ! -z "$NOSTRIP" ] ||
   ! do_loudly ${CROSS_COMPILE}${STRIP} "$UNSTRIPPED" -o "$OUTNAME"
 then
-  echo "strip failed, using unstripped" &&
+  [ -z "$NOSTRIP" ] && echo "strip failed, using unstripped"
   rm -f "$OUTNAME" &&
   cp "$UNSTRIPPED" "$OUTNAME" ||
     exit 1
-- 
cgit v1.2.3