pkg/53929: Full boostrap failure on FreeBSD

[triaxx%NetBSD.org@localhost]

>Number:         53929
>Category:       pkg
>Synopsis:       Full boostrap failure on FreeBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 30 17:55:00 +0000 2019
>Originator:     Frédéric Fauberteau
>Release:        pkgsrc-2018Q4
>Organization:
>Environment:
FreeBSD cocoon.triaxx.org 12.0-RELEASE-p2 FreeBSD 12.0-RELEASE-p2 GENERIC  amd64
Architecture: x86_64
Machine: amd64
>Description:
When the compiler is checked, $compiler is set but not $CC. Therefore lang/nawk tries to build with gcc as default compiler.

===> Bootstrapping awk
===> running: /bin/sh /usr/pkgsrc/bootstrap/work/bin/install-sh -d -o root -g wheel /usr/pkgsrc/bootstrap/work/awk
===> running: (cd /usr/pkgsrc/bootstrap/work/awk && /usr/pkgsrc/bootstrap/work/bin/bmake  -j2 -f Makefile CC="gcc" CFLAGS="")
--- ytab.o ---
--- b.o ---
--- ytab.o ---
gcc   -c ytab.c
--- b.o ---
gcc   -c b.c
pdksh: <stdin>[3]: gcc: not found
*** [b.o] Error code 127

bmake: stopped in /usr/pkgsrc/bootstrap/work/awk
--- ytab.o ---
pdksh: <stdin>[3]: gcc: not found
*** [ytab.o] Error code 127

bmake: stopped in /usr/pkgsrc/bootstrap/work/awk

bmake: stopped in /usr/pkgsrc/bootstrap/work/awk
===> exited with status 2
>How-To-Repeat:
./bootstrap --full --prefer-pkgsrc
>Fix:
Index: bootstrap
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
retrieving revision 1.260
diff -u -r1.260 bootstrap
--- bootstrap	15 Nov 2018 22:08:30 -0000	1.260
+++ bootstrap	30 Jan 2019 17:48:12 -0000
@@ -974,8 +974,10 @@
 	# 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)