diff options
Diffstat (limited to 'gnu/egcs')
| -rw-r--r-- | gnu/egcs/libobjc/Makefile.bsd-wrapper | 19 | ||||
| -rw-r--r-- | gnu/egcs/libstdc++/Makefile.bsd-wrapper | 34 |
2 files changed, 27 insertions, 26 deletions
diff --git a/gnu/egcs/libobjc/Makefile.bsd-wrapper b/gnu/egcs/libobjc/Makefile.bsd-wrapper index f4adc05545f..d00cf84ad6b 100644 --- a/gnu/egcs/libobjc/Makefile.bsd-wrapper +++ b/gnu/egcs/libobjc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2000/05/15 06:10:21 niklas Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2001/11/22 20:37:18 espie Exp $ LIB= objc @@ -56,6 +56,7 @@ config.status: Makefile.in configure cd $(EGCS_OBJDIR)/gcc && touch cc1obj PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ + GNUSYSTEM_AUX_DIR=${GNUSYSTEM_AUX_DIR} \ r=$(EGCS_OBJDIR) \ /bin/sh ${.CURDIR}/configure \ --prefix=/usr --with-local-prefix=/usr ${CF} \ @@ -65,26 +66,26 @@ config.status: Makefile.in configure COMPILE.m=${COMPILE.c} -fgnu-runtime gc.o: gc.c - @echo "${COMPILE.m} ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.m} ${.ALLSRC} -o ${.TARGET}" + @${COMPILE.m} ${.ALLSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o gc.go: gc.c - @echo "${COMPILE.m} -g ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.m} -g ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.m} -g ${.ALLSRC} -o ${.TARGET}" + @${COMPILE.m} -g ${.ALLSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o gc.po: gc.c - @echo "${COMPILE.m} -p ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.m} -p ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.m} -p ${.ALLSRC} -o ${.TARGET}" + @${COMPILE.m} -p ${.ALLSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o gc.so: gc.c - @echo "${COMPILE.m} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.m} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.m} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}" + @${COMPILE.m} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper index 0b21e2d094b..fd84aea00fb 100644 --- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper +++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2000/08/25 14:36:39 maja Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2001/11/22 20:37:18 espie Exp $ .if (${MACHINE_ARCH} == "mips") NOPIC= @@ -110,50 +110,50 @@ $(QLIBIBERTY_OBJS) $(QLIBIBERTY_OBJS:.o=.go) $(QLIBIBERTY_OBJS:.o=.po) $(QLIBIBE cd $(LIBIBERTY_DIR); $(MAKE) -f Makefile.bsd-wrapper stdexcepti.o: stdexcepti.cc - @echo "${COMPILE.cc} -frtti ${.IMPSRC}" - @${COMPILE.cc} -frtti ${.IMPSRC} -frtti -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti ${.CURDIR}/stdexcepti.cc" + @${COMPILE.cc} -frtti ${.CURDIR}/stdexcepti.cc -frtti -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o stdexcepti.go: stdexcepti.cc - @echo "${COMPILE.cc} -frtti -g ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti -g ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti -g ${.CURDIR}/stdexcepti.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti -g ${.CURDIR}/stdexcepti.cc -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o stdexcepti.po: stdexcepti.cc - @echo "${COMPILE.cc} -frtti -p ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti -p ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti -p ${.CURDIR}/stdexcepti.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti -p ${.CURDIR}/stdexcepti.cc -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o stdexcepti.so: stdexcepti.cc - @echo "${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o typeinfoi.o: typeinfoi.cc $(.CURDIR)/std/typeinfo.h - @echo "${COMPILE.cc} -frtti ${.IMPSRC}" - @${COMPILE.cc} -frtti ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti ${.CURDIR}/typeinfoi.cc" + @${COMPILE.cc} -frtti ${.CURDIR}/typeinfoi.cc -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o typeinfoi.go: typeinfoi.cc $(.CURDIR)/std/typeinfo.h - @echo "${COMPILE.cc} -frtti -g ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti -g ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti -g ${.CURDIR}/typeinfoi.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti -g ${.CURDIR}/typeinfoi.cc -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o typeinfoi.po: typeinfoi.cc $(.CURDIR)/std/typeinfo.h - @echo "${COMPILE.cc} -frtti -p ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti -p ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti -p ${.CURDIR}/typeinfoi.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti -p ${.CURDIR}/typeinfoi.cc -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o typeinfoi.so: typeinfoi.cc $(.CURDIR)/std/typeinfo.h - @echo "${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}" - @${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o + @echo "${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/typeinfoi.cc -o ${.TARGET}" + @${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/typeinfoi.cc -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o |