From edceb2d6b39e794b1b80d1f8de7cc63d52408a8a Mon Sep 17 00:00:00 2001 From: bde Date: Sun, 27 Dec 1998 17:25:27 +0000 Subject: Avoid using `ld -O' (as in bsd.lib.mk). `ld -O' seems to have caused only non-problems for elf -- `ld -elf -O foo.tmp -x -r foo' apparently puts the result in a.out so it has essentially no effect. --- gnu/lib/libstdc++/Makefile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index 891dfa3..10c3198 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.9 1998/03/20 15:10:59 bde Exp $ +# $Id: Makefile,v 1.10 1998/10/11 04:56:03 peter Exp $ # GPPDIR= ${.CURDIR}/../../../contrib/libg++ @@ -93,32 +93,40 @@ beforeinstall: # ======== typeinfoi.o, stdexcepti.o ======== .for file in typeinfoi stdexcepti +CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp ${file}.o: ${file}.cc ${CXX} ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -x -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} ${file}.so: ${file}.cc ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -x -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} ${file}.po: ${file}.cc ${CXX} -p ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -X -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} .endfor # ======== exceptioni.o ======== .for file in exceptioni +CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp ${file}.o: ${file}.cc ${CXX} ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -x -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} ${file}.so: ${file}.cc ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -x -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} ${file}.po: ${file}.cc ${CXX} -p ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -O ${.TARGET} -X -r ${.TARGET} + @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} .endfor # ======== cstrmain.o ======== -- cgit v1.1