From: ceriel <none@none>
Date: Tue, 30 Jun 1987 18:30:45 +0000 (+0000)
Subject: pass EMHOME to nested make
X-Git-Tag: release-5-5~4047
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=d41028a664a0e5d218bdd7a4ac74c928aabf60e0;p=ack.git

pass EMHOME to nested make
---

diff --git a/lang/cem/cemcom/Makefile b/lang/cem/cemcom/Makefile
index ad2bbf3e1..fd23d7791 100644
--- a/lang/cem/cemcom/Makefile
+++ b/lang/cem/cemcom/Makefile
@@ -110,11 +110,11 @@ SRC =	$(CSRC) $(LCSRC) $(GCSRC)
 	./make.allocd <$*.str >$*.h
 
 Main:	Cfiles
-	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make $(CURRDIR)/main ; else sh Resolve main ; fi'
+	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) $(CURRDIR)/main ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve main ; fi'
 	@rm -f nmclash.o a.out
 
 Emain:	Cfiles
-	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make $(CURRDIR)/emain ; else sh Resolve emain ; fi'
+	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) $(CURRDIR)/emain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve emain ; fi'
 	@rm -f nmclash.o a.out
 
 install:	Main
@@ -137,7 +137,7 @@ clean:
 	(cd .. ; rm -rf Xsrc)
 
 lint:	Cfiles
-	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make Xlint ; else sh Resolve Xlint ; fi'
+	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) Xlint ; else sh Resolve Xlint ; fi'
 	@rm -f nmclash.o a.out
 
 longnames:	$(SRC) $(HFILES)
diff --git a/lang/cem/cemcom/Makefile.erik b/lang/cem/cemcom/Makefile.erik
index 8a330e06a..4d31d2232 100644
--- a/lang/cem/cemcom/Makefile.erik
+++ b/lang/cem/cemcom/Makefile.erik
@@ -105,9 +105,9 @@ NEXTFILES = code.str declar.str decspecs.str def.str expr.str field.str \
 all:	cc
 
 cc:
-	make "CC=$(CC)" hfiles
-	make "CC=$(CC)" LLfiles
-	make "CC=$(CC)" main
+	make "EMHOME="$(EMHOME) "CC=$(CC)" hfiles
+	make "EMHOME="$(EMHOME) "CC=$(CC)" LLfiles
+	make "EMHOME="$(EMHOME) "CC=$(CC)" main
 
 cem:	cem.c
 	$(CC) -O cem.c $(SYSLIB) -o cem
diff --git a/lang/cem/cemcom/Resolve b/lang/cem/cemcom/Resolve
index cc5a90842..2a0714cc0 100755
--- a/lang/cem/cemcom/Resolve
+++ b/lang/cem/cemcom/Resolve
@@ -26,7 +26,7 @@ then
 	:
 else	mkdir ../Xsrc
 fi
-make longnames
+make EMHOME=$EMHOME longnames
 : remove code generating routines from the clashes list as they are defines.
 : code generating routine names start with C_
 sed '/^C_/d' < longnames > tmp$$
@@ -48,11 +48,11 @@ $i:	clashes $PW/$i
 	cid -Fclashes < $PW/$i > $i
 EOF
 done
-make `cat $PW/Cfiles`
+make EMHOME=$EMHOME `cat $PW/Cfiles`
 rm -f makefile
 ed - $PW/makefile <<'EOF'
 /^#EXCLEXCL/,/^#INCLINCL/d
 w makefile
 q
 EOF
-make CURRDIR=$PW $target
+make EMHOME=$EMHOME CURRDIR=$PW $target
diff --git a/lang/cem/cemcom/ival.g b/lang/cem/cemcom/ival.g
index 20b3da180..ab58198d3 100644
--- a/lang/cem/cemcom/ival.g
+++ b/lang/cem/cemcom/ival.g
@@ -290,7 +290,7 @@ gen_tpend()
 	register struct sdef *sd;
 	int getout = 0;
 
-	while (!getout) {
+	while (!getout && p) {
 	    if (!gen_error) {
 		tp = *(p->s_tpp);
 		switch(tp->tp_fund) {
diff --git a/mach/arm/ncg/Makefile b/mach/arm/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/arm/ncg/Makefile
+++ b/mach/arm/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/i386/ncg/Makefile b/mach/i386/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/i386/ncg/Makefile
+++ b/mach/i386/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/i80/ncg/Makefile b/mach/i80/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/i80/ncg/Makefile
+++ b/mach/i80/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/i86/ncg/Makefile b/mach/i86/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/i86/ncg/Makefile
+++ b/mach/i86/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/m68020/ncg/Makefile b/mach/m68020/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/m68020/ncg/Makefile
+++ b/mach/m68020/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/m68k2/ncg/Makefile b/mach/m68k2/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/m68k2/ncg/Makefile
+++ b/mach/m68k2/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/m68k4/ncg/Makefile b/mach/m68k4/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/m68k4/ncg/Makefile
+++ b/mach/m68k4/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/moon3/ncg/Makefile b/mach/moon3/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/moon3/ncg/Makefile
+++ b/mach/moon3/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/ns/ncg/Makefile b/mach/ns/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/ns/ncg/Makefile
+++ b/mach/ns/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/pdp/ncg/Makefile b/mach/pdp/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/pdp/ncg/Makefile
+++ b/mach/pdp/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg
diff --git a/mach/proto/ncg/Makefile b/mach/proto/ncg/Makefile
index 66cd8e25f..7d95335f7 100644
--- a/mach/proto/ncg/Makefile
+++ b/mach/proto/ncg/Makefile
@@ -22,7 +22,7 @@ OFILES=codegen.o compute.o equiv.o fillem.o gencode.o glosym.o main.o\
        move.o nextem.o reg.o regvar.o salloc.o state.o subr.o var.o
 
 all:	tables.c
-	make cg
+	make "EMHOME="$(EMHOME) cg
 
 cg: tables.o $(OFILES)
 	$(CC) $(LDFLAGS) $(OFILES) tables.o $(LIBS) -o cg