summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-19 15:27:37 +0000
committerjlam <jlam>2006-07-19 15:27:37 +0000
commit9609206ea89aedc1be57fb8c646cc0d46fdd543c (patch)
tree22b355c87d057352a90eafcbfdcba6198cff691a /bootstrap
parentd7f0e7782a5e643e76f6a2d95176fb94f4150475 (diff)
downloadpkgsrc-9609206ea89aedc1be57fb8c646cc0d46fdd543c.tar.gz
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 (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap5
1 files changed, 3 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 37374486da5..665c7b1137b 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -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 @@ bmake=$prefix/bin/bmake
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}