From d998769c1d926ae37ab354b0ff79cd68490cd81a Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Sat, 24 Jan 2004 20:03:28 +0000 Subject: [PATCH] Both cc and cc3 were built using CCVER=$(CCVER) for certain compiler path. Since this value is set to choose the build compiler, one of the two was compiled with wrong pathes for its backend. To fix this a new variable MY_CCVER is added to Makefile.inc which specifies the version of the compiler being built. --- gnu/usr.bin/cc/Makefile.inc | 3 ++- gnu/usr.bin/cc/c++/Makefile | 4 ++-- gnu/usr.bin/cc/cc/Makefile | 4 ++-- gnu/usr.bin/cc/cpp/Makefile | 4 ++-- gnu/usr.bin/cc/f77/Makefile | 4 ++-- gnu/usr.bin/cc3/Makefile.inc | 3 ++- gnu/usr.bin/cc3/c++/Makefile | 4 ++-- gnu/usr.bin/cc3/cc/Makefile | 4 ++-- gnu/usr.bin/cc3/cpp/Makefile | 4 ++-- gnu/usr.bin/cc3/f77/Makefile | 4 ++-- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 1489bb69fb..ae72208060 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.49.2.6 2002/11/15 18:18:38 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc/Attic/Makefile.inc,v 1.4 2004/01/16 07:45:21 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/cc/Attic/Makefile.inc,v 1.5 2004/01/24 20:03:27 joerg Exp $ +MY_CCVER=gcc2 BINDIR?=/usr/bin/gcc2 .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index 98bf845218..cb43ff0312 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.16.2.3 2002/11/15 18:18:38 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc/c++/Attic/Makefile,v 1.4 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc/c++/Attic/Makefile,v 1.5 2004/01/24 20:03:27 joerg Exp $ .include "../Makefile.inc" @@ -13,7 +13,7 @@ NOMAN= 1 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile index 1832bef957..bb0d23bb52 100644 --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.20.2.4 2002/11/15 18:18:38 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc/cc/Attic/Makefile,v 1.4 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc/cc/Attic/Makefile,v 1.5 2004/01/24 20:03:27 joerg Exp $ .include "../Makefile.inc" @@ -15,7 +15,7 @@ MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile index 7492b91d27..8bffe88ed5 100644 --- a/gnu/usr.bin/cc/cpp/Makefile +++ b/gnu/usr.bin/cc/cpp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.18.2.2 2002/11/15 18:18:39 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc/cpp/Attic/Makefile,v 1.4 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc/cpp/Attic/Makefile,v 1.5 2004/01/24 20:03:27 joerg Exp $ .include "../Makefile.inc" @@ -11,7 +11,7 @@ NOMAN= 1 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile index 21f835b0b1..4e7a4defe2 100644 --- a/gnu/usr.bin/cc/f77/Makefile +++ b/gnu/usr.bin/cc/f77/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.12.2.2 2002/11/15 18:18:39 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc/f77/Attic/Makefile,v 1.4 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc/f77/Attic/Makefile,v 1.5 2004/01/24 20:03:27 joerg Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS= gcc.c g77spec.c version.c CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/Makefile.inc b/gnu/usr.bin/cc3/Makefile.inc index 1eae27b21f..38ea242ccf 100644 --- a/gnu/usr.bin/cc3/Makefile.inc +++ b/gnu/usr.bin/cc3/Makefile.inc @@ -1,7 +1,8 @@ # $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.63 2002/06/04 19:45:08 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/Attic/Makefile.inc,v 1.2 2004/01/20 19:31:18 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/Attic/Makefile.inc,v 1.3 2004/01/24 20:03:27 joerg Exp $ BINDIR?=/usr/bin/gcc3 +MY_CCVER=gcc3 .include "../Makefile.inc" # Sometimes this is .include'd several times... diff --git a/gnu/usr.bin/cc3/c++/Makefile b/gnu/usr.bin/cc3/c++/Makefile index 87d34a6ecc..d1e1682874 100644 --- a/gnu/usr.bin/cc3/c++/Makefile +++ b/gnu/usr.bin/cc3/c++/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.19 2002/06/04 19:45:08 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/c++/Attic/Makefile,v 1.3 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/c++/Attic/Makefile,v 1.4 2004/01/24 20:03:27 joerg Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -14,7 +14,7 @@ NOMAN= 1 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/cc/Makefile b/gnu/usr.bin/cc3/cc/Makefile index a638e52b50..c38c1345aa 100644 --- a/gnu/usr.bin/cc3/cc/Makefile +++ b/gnu/usr.bin/cc3/cc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.28 2002/06/05 21:30:43 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cc/Attic/Makefile,v 1.3 2004/01/23 10:59:52 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cc/Attic/Makefile,v 1.4 2004/01/24 20:03:28 joerg Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -16,7 +16,7 @@ LINKS= ${BINDIR}/cc ${BINDIR}/gcc CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/cpp/Makefile b/gnu/usr.bin/cc3/cpp/Makefile index 711d449b19..6180f362d3 100644 --- a/gnu/usr.bin/cc3/cpp/Makefile +++ b/gnu/usr.bin/cc3/cpp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.23 2003/06/06 13:46:55 kuriyama Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cpp/Attic/Makefile,v 1.4 2004/01/24 14:43:42 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cpp/Attic/Makefile,v 1.5 2004/01/24 20:03:28 joerg Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -11,7 +11,7 @@ SRCS= gcc.c cppspec.c CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/f77/Makefile b/gnu/usr.bin/cc3/f77/Makefile index 85efc20632..dd106c6912 100644 --- a/gnu/usr.bin/cc3/f77/Makefile +++ b/gnu/usr.bin/cc3/f77/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.21 2004/01/05 20:23:16 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/f77/Attic/Makefile,v 1.3 2004/01/23 10:59:53 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/f77/Attic/Makefile,v 1.4 2004/01/24 20:03:28 joerg Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -11,7 +11,7 @@ SRCS= gcc.c g77spec.c CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" -CFLAGS+= -DCCVER=\"$(CCVER)\" +CFLAGS+= -DCCVER=\"$(MY_CCVER)\" CFLAGS+= -DFORTRAN_INIT=\"-lg2c\" -DFORTRAN_INIT_PROFILE=\"-lg2c_p\" DPADD= ${LIBCC_INT} -- 2.41.0