diff options
| -rw-r--r-- | lang/gcc28/Makefile | 24 | ||||
| -rw-r--r-- | lang/glibstdc++28/Makefile | 12 |
2 files changed, 15 insertions, 21 deletions
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile index a1e4362b189d..ca07a15a2330 100644 --- a/lang/gcc28/Makefile +++ b/lang/gcc28/Makefile @@ -4,7 +4,7 @@ # Date created: 17 Jan 1998 # Whom: David O'Brien <obrien@NUXI.com> # -# $Id: Makefile,v 1.21 1999/02/09 18:25:42 obrien Exp $ +# $Id: Makefile,v 1.22 1999/03/08 07:28:29 asami Exp $ # DISTNAME= gcc-2.8.1 @@ -17,18 +17,14 @@ MAINTAINER= obrien@FreeBSD.org .include <bsd.port.pre.mk> .if ${PORTOBJFORMAT} == "elf" -GNUHOST= ${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} .else -GNUHOST= ${ARCH}-unknown-freebsdaout${OSREL} +CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL} .endif -PLIST_SUB= GNUHOST=${GNUHOST} -CONFIGURE_ARGS= --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/include/g++ -.if ${PORTOBJFORMAT} == "elf" -CONFIGURE_ARGS+= --host=${GNUHOST} -.endif +PLIST_SUB= GNUHOST=${CONFIGURE_TARGET} +CONFIGURE_ARGS= --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/include/g++ GNU_CONFIGURE= yes -CONFIGURE_TARGET= # empty USE_GMAKE= yes ALL_TARGET= bootstrap MAN1= cccp28.1 g++28.1 gcc28.1 @@ -58,11 +54,11 @@ post-install: @${RM} -f ${PREFIX}/bin/c++ (for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/gcov \ ${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \ - ${PREFIX}/bin/${GNUHOST}-gcc \ - ${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1 \ - ${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1obj \ - ${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cc1plus \ - ${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/cpp ; \ + ${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \ + ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/cc1 \ + ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/cc1obj \ + ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/cc1plus \ + ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/cpp ; \ do strip $$prog ; \ done) ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc28 diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile index e10125f9b888..faaac6bcf39e 100644 --- a/lang/glibstdc++28/Makefile +++ b/lang/glibstdc++28/Makefile @@ -4,7 +4,7 @@ # Date created: 03 Mar 1998 # Whom: David O'Brien <obrien@NUXI.com> # -# $Id: Makefile,v 1.16 1999/03/08 07:28:30 asami Exp $ +# $Id: Makefile,v 1.17 1999/03/11 21:47:12 scrappy Exp $ # DISTNAME= libstdc++-2.8.1.1 @@ -27,16 +27,14 @@ RUN_DEPENDS= gcc28:${PORTSDIR}/lang/gcc28 \ CC= gcc28 CXX= g++28 .if ${PORTOBJFORMAT} == "elf" -GNUHOST= i386-unknown-freebsd${OSREL} +CONFIGURE_TARGET= i386-portbld-freebsd${OSREL} .else -GNUHOST= i386-unknown-freebsdaout${OSREL} +CONFIGURE_TARGET= i386-portbld-freebsdaout${OSREL} .endif -GCC28DIR= lib/gcc-lib/${GNUHOST}/2.8.1 -CONFIGURE_ARGS= --host=${GNUHOST} +GCC28DIR= lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= # empty USE_GMAKE= yes -PLIST_SUB= GCC28SUBDIR=${GCC28DIR} GNUHOST=${GNUHOST} +PLIST_SUB= GCC28SUBDIR=${GCC28DIR} GNUHOST=${CONFIGURE_TARGET} pre-install: @# allow a boched ``make install'' to be re-tried |