On Thu, May 3, 2012 at 6:07 PM, Irek Szczesniak <[email protected]> wrote:
> On Thu, May 3, 2012 at 5:44 PM, Glenn Fowler <[email protected]> wrote:
>>
>> thanks
>> I had done Shbltin_t* for b_xargs() but that was newer than the
>> builtin grep src I was working off of
>
> Ok. Next stop: Patch for SHOPT_EXPERIMENTALBUILTINS

Glenn, do you know why the patch below does not work? It seems the
nmake if doesn't find the SHOPT_EXTRA_BUILTIN substring in CCFLAGS:
==================
diff --git a/src/cmd/ksh93/data/builtins.c b/src/cmd/ksh93/data/builtins.c
index 95f10f8..935e249 100644
--- a/src/cmd/ksh93/data/builtins.c
+++ b/src/cmd/ksh93/data/builtins.c
@@ -138,6 +138,14 @@ const struct shtable3 shtab_builtins[] =
        CMDLIST(uname)
        CMDLIST(wc)
        CMDLIST(sync)
+#ifdef SHOPT_EXTRA_BUILTINS
+       CMDLIST(egrep)
+       CMDLIST(fgrep)
+       CMDLIST(grep)
+       CMDLIST(pgrep)
+       CMDLIST(xgrep)
+       CMDLIST(xargs)
+#endif
 #endif
 #if SHOPT_REGRESS
        "__regress__",          NV_BLTIN|BLT_ENV,       bltin(__regress__),
diff --git a/src/lib/libcmd/Makefile b/src/lib/libcmd/Makefile
index 3cecffd..6fc29e8 100644
--- a/src/lib/libcmd/Makefile
+++ b/src/lib/libcmd/Makefile
@@ -17,6 +17,10 @@ CHMOD = $(STDCHMOD|"chmod")

 HOSTTYPE == "$(CC.HOSTTYPE)"

+if CCFLAGS == "*SHOPT_EXTRA_BUILTINS=1*"
+       EXTRA_BUILTINS = grep.c xargs.c
+end
+
 cmd 1.2 :LIBRARY: RELEASE cmdinit.c \
        cmd.h rev.h wc.h \
        basename.c cat.c chgrp.c chmod.c chown.c cksum.c cmp.c \
@@ -25,6 +29,7 @@ cmd 1.2 :LIBRARY: RELEASE cmdinit.c \
        mkfifo.c mktemp.c mv.c paste.c pathchk.c pids.c rev.c rm.c \
        rmdir.c stty.c sum.c sync.c tail.c tee.c tty.c uname.c uniq.c \
        vmstate.c wc.c revlib.c wclib.c sumlib.o \
+       $(EXTRA_BUILTINS) \
        fts_fix.c lib.c \
        -lfsg -lmd

==================

Irek
_______________________________________________
ast-developers mailing list
[email protected]
https://mailman.research.att.com/mailman/listinfo/ast-developers

Reply via email to