summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authortriaxx <triaxx@pkgsrc.org>2019-02-06 17:38:54 +0000
committertriaxx <triaxx@pkgsrc.org>2019-02-06 17:38:54 +0000
commit735f1bac46bf921e757c9d17c491607636b14116 (patch)
tree7fe435182f145e5a3ca0186b9ea4d61650f2488b /bootstrap
parent7a8d31d1d193a80f2055a2becb34ac0c3158af98 (diff)
downloadpkgsrc-735f1bac46bf921e757c9d17c491607636b14116.tar.gz
set $CC when clang is detected in bootstrap
The commit in pkgsrc-2018Q4 is due to a mistake. Sorry :(
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap4
1 files changed, 3 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index f1a82fc803e..6100298a6ea 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -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>
# All rights reserved.
@@ -974,8 +974,10 @@ if [ "$compiler" = "" ] && [ x"$check_compiler" = x"yes" ]; then
# 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)