diff options
author | joerg <joerg@pkgsrc.org> | 2010-05-13 18:37:38 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2010-05-13 18:37:38 +0000 |
commit | 4f45bdd33e7709b15d484a629483e12d8643a6e1 (patch) | |
tree | 02b3c15a894b2d1a3266741e1784766e31b2815d /devel/bmake/files/boot-strap | |
parent | 80199590869cf77565b0b4dea7357b2043cbcd15 (diff) | |
download | pkgsrc-4f45bdd33e7709b15d484a629483e12d8643a6e1.tar.gz |
Import bmake-20100510:
- use absolute path for bmake when running tests during boot-strap
- revert use of realpath on argv[0]
- print MAKE_PRINT_VAR_ON_ERROR before running .ERROR target
- fix for missing SIGCHLD when compiled with SunPRO
- fflush stdout before writing to stdout
Diffstat (limited to 'devel/bmake/files/boot-strap')
-rwxr-xr-x | devel/bmake/files/boot-strap | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap index 3ab787f46f0..e4117008dd0 100755 --- a/devel/bmake/files/boot-strap +++ b/devel/bmake/files/boot-strap @@ -53,7 +53,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.1.1.7 2010/04/24 20:33:52 joerg Exp $ +# $Id: boot-strap,v 1.1.1.8 2010/05/13 18:37:40 joerg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -294,12 +294,16 @@ if [ -s "${mksrc:-/dev/null}/install-mk" ]; then esac fi export MAKESYSPATH -./bmake test || exit 1 - +if [ "$mksrc" ]; then + $objdir/bmake test || exit 1 +else + # assume nothing + $objdir/bmake -r -m / test || exit 1 +fi # If -q given, we don't want all the install instructions $quiet exit 0 -make_version=`./bmake -f ./Makefile -V MAKE_VERSION | ( read one two; echo $one )` +make_version=`./bmake -r -m / -f ./Makefile -V MAKE_VERSION | ( read one two; echo $one )` bmake_version=bmake-$make_version if [ -s /usr/share/tmac/andoc.tmac ]; then |