CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Nov  9 13:37:09 UTC 2018

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Ensure CC is considered for SSP tests.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.257 pkgsrc/bootstrap/bootstrap:1.258
--- pkgsrc/bootstrap/bootstrap:1.257    Mon Nov  5 19:26:38 2018
+++ pkgsrc/bootstrap/bootstrap  Fri Nov  9 13:37:09 2018
@@ -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@localhost>
 # All rights reserved.
@@ -993,14 +993,9 @@ if [ "$compiler" = "" ] && [ x"$check_co
 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