From: Darren Tucker <dtucker@dtucker.net>
Date: Tue, 12 Jul 2022 02:54:24 +0000 (+1000)
Subject: Move unset to before we set anything.
X-Git-Tag: V_9_1_P1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb2f3a61bf3d28fff285524535f7ffcd177c9235;p=thirdparty%2Fopenssh-portable.git

Move unset to before we set anything.
---

diff --git a/.github/configs b/.github/configs
index 0308ca6c1..48070ee75 100755
--- a/.github/configs
+++ b/.github/configs
@@ -10,6 +10,8 @@
 
 config=$1
 
+unset CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO
+
 TEST_TARGET="tests"
 LTESTS=""
 SKIP_LTESTS=""
@@ -17,7 +19,6 @@ SUDO=sudo	# run with sudo by default
 TEST_SSH_UNSAFE_PERMISSIONS=1
 # Stop on first test failure to minimize logs
 TEST_SSH_FAIL_FATAL=yes
-unset CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO
 
 CONFIGFLAGS=""
 LIBCRYPTOFLAGS=""
@@ -72,7 +73,7 @@ case "$config" in
 	    TEST_TARGET="t-exec"
 	    ;;
 	clang-sanitize-memory)
-	    CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins"
+	    CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer"
 	    LDFLAGS="-fsanitize=memory"
 	    CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DMSAN_OPTIONS=\"log_path='$SANLOGS'/msan.log\"'
 	    CONFIGFLAGS="--without-openssl --without-zlib --without-shadow"