pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/bootstrap Set CLANGBASE=/usr automatically if CLANGBAS...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/111130c2281f
branches:  trunk
changeset: 632670:111130c2281f
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Apr 03 09:05:11 2014 +0000

description:
Set CLANGBASE=/usr automatically if CLANGBASE is not set and /usr/bin/clang exists.

It is expected in mk/compiler/clang.mk that CLANGBASE is set properly
even if builtin clang is selected.

diffstat:

 bootstrap/bootstrap |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r aea4cc52dba8 -r 111130c2281f bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Apr 03 08:50:59 2014 +0000
+++ b/bootstrap/bootstrap       Thu Apr 03 09:05:11 2014 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.204 2014/03/14 21:52:13 ryoon Exp $
+# $NetBSD: bootstrap,v 1.205 2014/04/03 09:05:11 obache Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -981,6 +981,9 @@
        echo "CC=                       clang"     >> ${TARGET_MKCONF}
        echo "CXX=                      clang++"   >> ${TARGET_MKCONF}
        echo "CPP=                      \${CC} -E" >> ${TARGET_MKCONF}
+       if [ -z "$CLANGBASE" -a -f "/usr/bin/clang" ]; then
+               CLANGBASE="/usr"
+       fi
        if [ -n "$CLANGBASE" -o -f "/bin/clang" ]; then
                echo "CLANGBASE=                $CLANGBASE" >> ${TARGET_MKCONF}
        fi



Home | Main Index | Thread Index | Old Index