From b5d3b38cb147560522943502f5b15e15070d4de1 Mon Sep 17 00:00:00 2001 From: tg Date: Mon, 8 Dec 2014 12:20:40 +0000 Subject: [PATCH] port this to GNU bash 1.12.1 from http://www.qemu-advent-calendar.org/#day-1 --- Build.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Build.sh b/Build.sh index 63c2ae5..e8991b1 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.671 2014/11/25 21:13:18 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.672 2014/12/08 12:20:40 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013, 2014 @@ -1784,7 +1784,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.671 2014/11/25 21:13:18 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.672 2014/12/08 12:20:40 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (isatty(0)); } EOF case $cm in @@ -2440,9 +2440,12 @@ llvm) ;; esac echo ": # work around NeXTstep bug" >Rebuild.sh -for file in "$srcdir"/*.opt; do +cd "$srcdir" +optfiles=`echo *.opt` +cd "$curdir" +for file in $optfiles; do echo "echo + Running genopt on '$file'..." - echo "(srcfile='$file'; BUILDSH_RUN_GENOPT=1; . '$srcdir/Build.sh')" + echo "(srcfile='$srcdir/$file'; BUILDSH_RUN_GENOPT=1; . '$srcdir/Build.sh')" done >>Rebuild.sh echo set -x >>Rebuild.sh for file in $SRCS; do @@ -2476,11 +2479,11 @@ if test $cm = makefile; then extras='emacsfn.h rlimits.opt sh.h sh_flags.opt var_spec.h' test 0 = $HAVE_SYS_SIGNAME && extras="$extras signames.inc" gens= genq= - for file in "$srcdir"/*.opt; do + for file in $optfiles; do genf=`basename "$file" | sed 's/.opt$/.gen/'` gens="$gens $genf" - genq="$genq$nl$genf: $srcdir/Build.sh $file - srcfile=$file; BUILDSH_RUN_GENOPT=1; . $srcdir/Build.sh" + genq="$genq$nl$genf: $srcdir/Build.sh $srcdir/$file + srcfile=$srcdir/$file; BUILDSH_RUN_GENOPT=1; . $srcdir/Build.sh" done cat >Makefrag.inc <