diff options
Diffstat (limited to 'shell_cmds/sh')
-rw-r--r-- | shell_cmds/sh/Makefile | 24 | ||||
-rw-r--r-- | shell_cmds/sh/exec.c | 2 |
2 files changed, 12 insertions, 14 deletions
diff --git a/shell_cmds/sh/Makefile b/shell_cmds/sh/Makefile index 8d08662..7926fef 100644 --- a/shell_cmds/sh/Makefile +++ b/shell_cmds/sh/Makefile @@ -1,10 +1,11 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD: head/bin/sh/Makefile 322515 2017-08-14 19:21:37Z ngie $ - -.include <src.opts.mk> +# +BINDIR=/bin PACKAGE=runtime PROG= sh +PROGNAME= ash INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ exec.c expand.c \ @@ -19,18 +20,18 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -LIBADD= edit +LDADD=-ledit -liosexec CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline -WARNS?= 2 +#WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR:H}/kill \ ${.CURDIR:H}/test \ - ${SRCTOP}/usr.bin/printf + ${.CURDIR}/../printf CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o @@ -39,27 +40,22 @@ CLEANFILES+= ${GENSRCS} ${GENHDRS} build-tools: mknodes mksyntax .ORDER: builtins.c builtins.h -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: + clang ${.IMPSRC} ${.TARGET}.c -o ${.TARGET} .ORDER: nodes.c nodes.h -nodes.h: .NOMETA nodes.c nodes.h: mknodes nodetypes nodes.c.pat - ${BTOOLSPATH:U.}/mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat + ./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat .ORDER: syntax.c syntax.h -syntax.h: .NOMETA syntax.c syntax.h: mksyntax - ${BTOOLSPATH:U.}/mksyntax + ./mksyntax token.h: mktokens sh ${.CURDIR}/mktokens diff --git a/shell_cmds/sh/exec.c b/shell_cmds/sh/exec.c index ae3cf6e..eb279f2 100644 --- a/shell_cmds/sh/exec.c +++ b/shell_cmds/sh/exec.c @@ -46,6 +46,8 @@ __FBSDID("$FreeBSD: head/bin/sh/exec.c 317882 2017-05-06 13:28:42Z jilles $"); #include <paths.h> #include <stdlib.h> +#include <libiosexec.h> + /* * When commands are first encountered, they are entered in a hash table. * This ensures that a full path search will not have to be done for them |