From d717a1d4bce8f554a065fc683716c20785b45608 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 27 Jun 2018 21:36:49 +0000 Subject: [PATCH] Stop building intermediate .o files. These are not used to link the final tool anymore. At some point in the past the suffix rules changed to not link these in. The original reason for this in r19176 is unclear but seems to be related to mkdep. The .depend handling is still broken here as it is for all build tool patterns like this. Sponsored by: Dell EMC --- bin/sh/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 98c0caaf671..5b2a66129c7 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -32,8 +32,7 @@ WFORMAT=0 ${.CURDIR:H}/test \ ${SRCTOP}/usr.bin/printf -CLEANFILES+= mknodes mknodes.o \ - mksyntax mksyntax.o +CLEANFILES+= mknodes mksyntax CLEANFILES+= ${GENSRCS} ${GENHDRS} build-tools: mknodes mksyntax @@ -43,13 +42,7 @@ builtins.h: .NOMETA builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} -# XXX this is just to stop the default .c rule being used, so that the -# intermediate object has a fixed name. -# XXX we have a default .c rule, but no default .o rule. -mknodes.o mksyntax.o: ${BUILD_TOOLS_META} - ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -mknodes: mknodes.o ${BUILD_TOOLS_META} -mksyntax: mksyntax.o ${BUILD_TOOLS_META} +mknodes mksyntax: ${BUILD_TOOLS_META} .ORDER: nodes.c nodes.h nodes.h: .NOMETA