Wed Feb 6 17:38:54 2019 UTC ()
set $CC when clang is detected in bootstrap

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

Sorry :(


(triaxx)
diff -r1.260 -r1.261 pkgsrc/bootstrap/bootstrap
cvs diff -r1.260 -r1.261 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2018/11/15 22:08:30 1.260
+++ pkgsrc/bootstrap/bootstrap 2019/02/06 17:38:54 1.261
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.260 2018/11/15 22:08:30 sevan Exp $ 3# $NetBSD: bootstrap,v 1.261 2019/02/06 17:38:54 triaxx Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -964,28 +964,30 @@ fi @@ -964,28 +964,30 @@ fi
964mkdir_p_early ${wrkdir} 964mkdir_p_early ${wrkdir}
965if touch ${wrkdir}/.writeable; then 965if touch ${wrkdir}/.writeable; then
966 : 966 :
967else 967else
968 die "\"${wrkdir}\" is not writeable. Try $0 -h" 968 die "\"${wrkdir}\" is not writeable. Try $0 -h"
969fi 969fi
970echo "Working directory is: ${wrkdir}" 970echo "Working directory is: ${wrkdir}"
971 971
972if [ "$compiler" = "" ] && [ x"$check_compiler" = x"yes" ]; then 972if [ "$compiler" = "" ] && [ x"$check_compiler" = x"yes" ]; then
973 get_compiler 973 get_compiler
974 # Clang pretends to be GCC, so we have to check it first. 974 # Clang pretends to be GCC, so we have to check it first.
975 if [ $compiler_is_clang -gt 0 ]; then 975 if [ $compiler_is_clang -gt 0 ]; then
976 compiler="clang" 976 compiler="clang"
 977 test -n "$CC" || CC=clang
977 elif [ $compiler_is_gnu -gt 0 ]; then 978 elif [ $compiler_is_gnu -gt 0 ]; then
978 compiler="gcc" 979 compiler="gcc"
 980 test -n "$CC" || CC=gcc
979 else 981 else
980 case "$opsys" in 982 case "$opsys" in
981 IRIX) 983 IRIX)
982 if [ `uname -r` -ge 6 ]; then 984 if [ `uname -r` -ge 6 ]; then
983 compiler="mipspro" 985 compiler="mipspro"
984 else 986 else
985 compiler="ido" 987 compiler="ido"
986 fi 988 fi
987 test -n "$CC" || CC=cc 989 test -n "$CC" || CC=cc
988 ;; 990 ;;
989 SunOS) compiler="sunpro" 991 SunOS) compiler="sunpro"
990 test -n "$CC" || CC=cc 992 test -n "$CC" || CC=cc
991 ;; 993 ;;