$NetBSD: patch-aa,v 1.14 2003/05/22 16:46:50 jmmv Exp $ --- Makefile.direct.orig 2003-03-07 20:08:44.000000000 +0100 +++ Makefile.direct 2003-05-14 00:27:50.000000000 +0200 @@ -20,8 +20,8 @@ # executables. CC=cc $(ABI_FLAG) -CXX=g++ $(ABI_FLAG) -AS=as $(AS_ABI_FLAG) +CXX=c++ $(ABI_FLAG) +AS=gcc -c -x assembler-with-cpp $(ABI_FLAG) # The above doesn't work with gas, which doesn't run cpp. # Define AS as `gcc -c -x assembler-with-cpp' instead. @@ -359,16 +359,23 @@ all: gc.a gctest -BSD-pkg-all: bsd-libgc.a +LEAKFLAGS=$(CFLAGS) -DFIND_LEAK + +BSD-pkg-all: bsd-libgc.a bsd-libleak.a bsd-libgc.a: $(MAKE) CFLAGS="$(CFLAGS)" clean c++-t mv gc.a bsd-libgc.a +bsd-libleak.a: + $(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt + mv gc.a bsd-libleak.a + BSD-pkg-install: BSD-pkg-all ${CP} bsd-libgc.a libgc.a ${INSTALL_DATA} libgc.a ${PREFIX}/lib ${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include + ${INSTALL_MAN} doc/gc.man ${PREFIX}/man/man3/gc.3 pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \ include/private/gc_locks.h include/gc.h include/private/gcconfig.h \ @@ -444,7 +451,6 @@ ./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o ./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o ./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null - ./test_cpp 1 echo > c++ dyn_load_sunos53.o: dyn_load.c