diff --git a/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h b/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h
index 59f95b80af83..4e793f772a24 100644
--- a/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h
+++ b/archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h
@@ -28,7 +28,7 @@
 #include <openssl/hmac.h>
 #include <openssl/opensslv.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* memset */
 static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 8def6e72fc6b..720fc7c8da35 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -131,40 +131,20 @@ echo_msg()
 get_compiler()
 {
 	testcc="${CC}"
-	# normally, we'd just use 'cc', but certain configure tools look
-	# for gcc specifically, so we have to see if that comes first
-	if [ -z "${testcc}" ]; then
-		save_IFS="${IFS}"
-		IFS=':'
-		for dir in ${PATH}; do
-			test -z "$dir" && dir=.
-			if [ -x "$dir/gcc" ]; then
-				testcc="$dir/gcc"
-				break
-			fi
-		done
-		IFS="${save_IFS}"
-	fi
-
 	# Clang compiler pretends to be GCC, so we have to check that
 	cat >${wrkdir}/$$.c <<EOF
-#ifdef __clang__
-indeed
-#endif
-EOF
-	compiler_is_clang=`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | grep -c indeed`
-	rm -f ${wrkdir}/$$.c
-
-	cat >${wrkdir}/$$.c <<EOF
-#ifdef __GNUC__
-#ifndef __clang__
-indeed
+#define GCC_COMPILER (defined(__GNUC__) && !defined(__clang__))
+#if GCC_COMPILER
+gcc
 #endif
+#ifdef __clang__
+clang
 #endif
 EOF
-	compiler_is_gnu=`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | grep -c indeed`
+	compiler_is_gnu=`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | grep -c gcc`
+	compiler_is_clang=`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | grep -c clang`
 	rm -f ${wrkdir}/$$.c
-
+	
 }
 get_abi()
 {
@@ -776,6 +756,7 @@ OpenBSD)
 	need_awk=no
 	need_sed=no
 	set_opsys=no
+	check_compiler=yes
 	machine_arch=`arch -s`
 	;;
 OSF1)