From 658cec5b944cc491ee936880963591eb55cbb1f4 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 13 Mar 2000 09:12:36 +0000
Subject: [PATCH] Move some cflag contents down to where they are acutally
 used.

---
 gnu/usr.bin/cc/Makefile.inc | 2 --
 gnu/usr.bin/cc/c++/Makefile | 3 +++
 gnu/usr.bin/cc/cc/Makefile  | 3 +++
 gnu/usr.bin/cc/cpp/Makefile | 3 +++
 gnu/usr.bin/cc/f77/Makefile | 3 +++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index fce44213620..87627b4f368 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -28,8 +28,6 @@ USE_EGCS_HAIFA=	1
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
 
 CFLAGS+=	-DFREEBSD_NATIVE -DIN_GCC -DHAVE_CONFIG_H
-CFLAGS+=	-DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+=	-DDEFAULT_TARGET_MACHINE=\"$(target)\"
 CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 .if defined(LONG_TYPE_SIZE)
 CFLAGS+=	-DLONG_TYPE_SIZE=${LONG_TYPE_SIZE}
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 4c25003d87b..d5a37ea66d5 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -10,6 +10,9 @@ LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 926c57e547a..435f21f3137 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -11,6 +11,9 @@ SRCS=	gcc.c gccspec.c
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 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)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index b5661d3658a..3ba15347903 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -8,6 +8,9 @@ PROG=	cpp
 SRCS=	gcc.c cppspec.c
 NOMAN=	1
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 72d7932b24b..6a57dcf3086 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -7,6 +7,9 @@
 PROG=	f77
 SRCS=	gcc.c g77spec.c version.c
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}