diff options
author | Josef Karthauser <joe@FreeBSD.org> | 2000-11-03 15:50:04 +0000 |
---|---|---|
committer | Josef Karthauser <joe@FreeBSD.org> | 2000-11-03 15:50:04 +0000 |
commit | c6e77fea5455fbaec8403cf54ed1413253e65487 (patch) | |
tree | b99ee690b44fc8badf227788bdd65dada6705e03 /release/picobsd | |
parent | ba2250ddb7f6b0f6d1694c33300ba5a30079eaf8 (diff) | |
download | src-c6e77fea5455fbaec8403cf54ed1413253e65487.tar.gz src-c6e77fea5455fbaec8403cf54ed1413253e65487.zip |
Crunchgen now has the necessary magic to include the make hooks that
munge_crunchmk was adding for us.
Notes
Notes:
svn path=/head/; revision=68287
Diffstat (limited to 'release/picobsd')
-rw-r--r-- | release/picobsd/build/Makefile.crunch | 5 | ||||
-rwxr-xr-x | release/picobsd/build/munge_crunchmk.pl | 30 |
2 files changed, 2 insertions, 33 deletions
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch index 13605482e1aa..53afe4f1c47e 100644 --- a/release/picobsd/build/Makefile.crunch +++ b/release/picobsd/build/Makefile.crunch @@ -8,12 +8,11 @@ all: crunch crunch: @cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf @( if [ -f crunch.inc ] ; then \ - crunchgen -h ./crunch.inc ./crunch1.conf ; \ + crunchgen -o -h ./crunch.inc ./crunch1.conf ; \ else \ - crunchgen ./crunch1.conf ; \ + crunchgen -o ./crunch1.conf ; \ fi ) @perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ; - ../../build/munge_crunchmk.pl crunch1.mk ; @env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk all strip --remove-section=.note --remove-section=.comment crunch1 diff --git a/release/picobsd/build/munge_crunchmk.pl b/release/picobsd/build/munge_crunchmk.pl deleted file mode 100755 index 8bfbac00a9e6..000000000000 --- a/release/picobsd/build/munge_crunchmk.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl -wi - -# Post process a crunch1.mk file: -# -# from... -# ftp_make: -# (cd $(ftp_SRCDIR) && make depend && make $(ftp_OBJS)) -# -# to... -# ftp_make: -# (cd $(ftp_SRCDIR) && make obj && make depend && make $(OPTS) $(ftp_OPTS) $(ftp_OBJS)) - -use strict; - -while (my $line = <>) { - if ( $line =~ /(.*)make depend && make (\$\((.*?)_OBJS\).*)/ ) { - my $start = $1; # The start of the line. - my $end = $2; # The end of the line. - my $prog = $3; # The parsed out name of the program. - - print $start; - print 'make obj && make depend && '; - print 'make $(OPTS) $(' . $prog . '_OPTS) '; - print $end, "\n"; - } else { - print $line; - } -} - -#end |