CVS commit: pkgsrc/bootstrap

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Feb  6 17:38:54 UTC 2019

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
set $CC when clang is detected in bootstrap

The commit in pkgsrc-2018Q4 is due to a mistake.

Sorry :(


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 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.260 pkgsrc/bootstrap/bootstrap:1.261
--- pkgsrc/bootstrap/bootstrap:1.260    Thu Nov 15 22:08:30 2018
+++ pkgsrc/bootstrap/bootstrap  Wed Feb  6 17:38:54 2019
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.260 2018/11/15 22:08:30 sevan Exp $
+# $NetBSD: bootstrap,v 1.261 2019/02/06 17:38:54 triaxx Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -974,8 +974,10 @@ if [ "$compiler" = "" ] && [ x"$check_co
        # Clang pretends to be GCC, so we have to check it first.
        if [ $compiler_is_clang -gt 0 ]; then
                compiler="clang"
+               test -n "$CC" || CC=clang
        elif [ $compiler_is_gnu -gt 0 ]; then
                compiler="gcc"
+               test -n "$CC" || CC=gcc
        else
                case "$opsys" in
                IRIX)