summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2018-11-09 13:37:09 +0000
committerjperkin <jperkin@pkgsrc.org>2018-11-09 13:37:09 +0000
commit626568e04e64ca64166740d9a0420e084ee576b1 (patch)
tree9cf9d82c936cd28536997a206967e15970b85aeb /bootstrap
parent8217a4c6d05a7b3b3886cecae87ad56f9c04e657 (diff)
downloadpkgsrc-626568e04e64ca64166740d9a0420e084ee576b1.tar.gz
bootstrap: Ensure CC is considered for SSP tests.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap9
1 files changed, 2 insertions, 7 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 0e6a76beed4..ae74230e2f6 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.257 2018/11/05 19:26:38 schmonz Exp $
+# $NetBSD: bootstrap,v 1.258 2018/11/09 13:37:09 jperkin Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -993,14 +993,9 @@ if [ "$compiler" = "" ] && [ x"$check_compiler" = x"yes" ]; then
fi
has_ssp_support() {
- _compiler=cc
- if [ "$compiler" != "" ]; then
- _compiler="$compiler"
- fi
-
mkdir_p_early ${wrkdir}/tmp
echo 'int main(void){return 0;}' > ${wrkdir}/tmp/ssp.c
- ${_compiler} -fstack-protector-strong -o ${wrkdir}/tmp/ssp ${wrkdir}/tmp/ssp.c >/dev/null 2>&1
+ ${CC:-cc} -fstack-protector-strong -o ${wrkdir}/tmp/ssp ${wrkdir}/tmp/ssp.c >/dev/null 2>&1
if [ $? -eq 0 ]; then
echo yes