pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Ensure CC is considered for SSP t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c941f59ccbf9
branches:  trunk
changeset: 387088:c941f59ccbf9
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Nov 09 13:37:09 2018 +0000

description:
bootstrap: Ensure CC is considered for SSP tests.

diffstat:

 bootstrap/bootstrap |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r 637ac7e12ea7 -r c941f59ccbf9 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri Nov 09 13:32:59 2018 +0000
+++ b/bootstrap/bootstrap       Fri Nov 09 13:37:09 2018 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index