[m-rev.] for review: Remove Cygwin hacks in boehm_gc/Makefile.direct

Peter Wang novalazy at gmail.com
Tue Aug 25 14:40:22 AEST 2015


We had these kind of lines:

    -./if_not_there mach_dep.o `cygpath -w /bin/sh` $(CC) ...
    -./if_not_there mach_dep.o /bin/sh $(CC) ...

They would have been necessary because $(CC) actually points to mgnuc,
a shell script, which the if_not_there.c program might not be able to
start with execvp().

Now that we have replaced if_not_there.c with a shell script, there
should be no need to refer to invoke /bin/sh explicitly.

Note that those lines were incorrectly merged into Boehm GC upstream.

boehm_gc/Makefile.direct:
	As above.
---
 boehm_gc/Makefile.direct | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/boehm_gc/Makefile.direct b/boehm_gc/Makefile.direct
index 116bfa6..3319434 100644
--- a/boehm_gc/Makefile.direct
+++ b/boehm_gc/Makefile.direct
@@ -425,16 +425,12 @@ mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.s \
 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
 	./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
 	./if_mach IA64 "" $(LD) -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o
-	-./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-	-./if_not_there mach_dep.o `cygpath -w /bin/sh` $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-	-./if_not_there mach_dep.o /bin/sh $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
+	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
 
 mark_rts.o: $(srcdir)/mark_rts.c $(UTILS)
 	rm -f mark_rts.o
 	-./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
-	-./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
-	-./if_not_there mark_rts.o `cygpath -w /bin/sh` $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
-	-./if_not_there mark_rts.o /bin/sh $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
+	./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
 #	Work-around for DEC optimizer tail recursion elimination bug.
 #  The ALPHA-specific line should be removed if gcc is used.
 
-- 
2.1.2




More information about the reviews mailing list