Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/hp700/stand/xxboot Fix the way this checks the obje...



details:   https://anonhg.NetBSD.org/src/rev/461da1eed4cf
branches:  trunk
changeset: 571527:461da1eed4cf
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Nov 29 15:19:26 2004 +0000

description:
Fix the way this checks the object files so it works correctly with make -j

diffstat:

 sys/arch/hp700/stand/xxboot/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 3f35cfafb0b4 -r 461da1eed4cf sys/arch/hp700/stand/xxboot/Makefile
--- a/sys/arch/hp700/stand/xxboot/Makefile      Mon Nov 29 13:55:59 2004 +0000
+++ b/sys/arch/hp700/stand/xxboot/Makefile      Mon Nov 29 15:19:26 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/11/07 21:58:45 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2004/11/29 15:19:26 jmc Exp $
 
 PROG=  xxboot
 SRCS=  start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
@@ -26,7 +26,7 @@
 LIBCRTEND=
 LIBC=
 
-${PROG}: iplsum
+${PROG}: iplsum ${OBJS}
        ${LD} -Ttext 0 -Tdata 0 -e '$$START$$' -N -o $@1 $(OBJS)
        ${LD} -Ttext 0x100 -Tdata 0x23456780 -e '$$START$$' -N -o $@2 $(OBJS)
        ${SIZE} $@1
@@ -58,6 +58,8 @@
 # are relative to $global$.
 .c.o:
        ${CC} ${CFLAGS} ${CPPFLAGS} -o $@.S -S ${.IMPSRC}
-       @grep -i 'ldil' $@.S | egrep -v "ldil L'-?[0-9]*," || exit 0; \
-               echo 'found non-relocatable code' >&2; exit 1
+       grep -i 'ldil' $@.S | egrep -v "ldil L'-?[0-9]*," > /dev/null 2>&1; \
+               if [ $$? = 0 ]; then \
+                       echo 'found non-relocatable code' >&2 && exit 1; \
+               fi
        sed -e 's/\.text/.data/' $@.S | ${AS} -o ${.TARGET}



Home | Main Index | Thread Index | Old Index