pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/bootstrap Explicitly set the compiler used to build na...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b579cd27260
branches:  trunk
changeset: 516335:8b579cd27260
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 19 15:27:37 2006 +0000

description:
Explicitly set the compiler used to build nawk.  The Makefile was
explicitly setting CC=cc, so override it on the bmake command line.
We use the CC taken from the environment first, and default to "gcc"
if CC is not set.

diffstat:

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

diffs (21 lines):

diff -r 43defb8d411e -r 8b579cd27260 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Jul 19 15:13:40 2006 +0000
+++ b/bootstrap/bootstrap       Wed Jul 19 15:27:37 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.68 2006/07/19 15:01:23 jlam Exp $
+# $NetBSD: bootstrap,v 1.69 2006/07/19 15:27:37 jlam Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -730,7 +730,8 @@
 case "$need_awk" in
 yes)   echo_msg "Installing awk"
        copy_src ../lang/nawk/files awk
-       run_cmd "(cd $wrkdir/awk && $bmake -f Makefile)"
+       test -z "$CC" || CC=gcc # default to gcc if no compiler is specified
+       run_cmd "(cd $wrkdir/awk && $bmake -f Makefile CC=\"${CC}\")"
        run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/awk/a.out $prefix/bin/nawk"
        run_cmd "$install_sh -c -o $user -g $group -m 644 $wrkdir/awk/nawk.1 $mandir/man1/nawk.1"
        echo "TOOLS_PLATFORM.awk?=              $prefix/bin/nawk" >> ${MKCONF_EXAMPLE}



Home | Main Index | Thread Index | Old Index