From baef823236d9ae5583e0fc50d0b4182d7e623a69 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Tue, 7 May 2002 01:26:58 +0000 Subject: [PATCH] The GCC target name does not always match our platform's name. MFC: rev 1.61 (needed a different way to keep from multiple inclusion) --- gnu/usr.bin/cc/Makefile.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index d49180555426..85aa3862f73c 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -3,14 +3,16 @@ .include "../Makefile.inc" # Sometimes this is .include'd several times... -.if !defined(GCCDIR) -GCCDIR= ${.CURDIR}/../../../../contrib/gcc +.if !defined(__CC_MAKEFILE_INC__) +__CC_MAKEFILE_INC__= ${MFILE} + +GCCDIR= ${.CURDIR}/../../../../contrib/gcc .include "Makefile.tgt" # Machine description. -MD_FILE= ${GCCDIR}/config/${TARGET_ARCH}/${TARGET_ARCH}.md -target= ${TARGET_ARCH}-unknown-freebsd +MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md +target= ${TARGET_ARCH}-undermydesk-freebsd CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}/usr\" @@ -50,4 +52,4 @@ LIBCC_INT= ${.OBJDIR}/../cc_int/libcc_int.a LIBCC_INT= ${.CURDIR}/../cc_int/libcc_int.a .endif -.endif # !GCCDIR +.endif # !__CC_MAKEFILE_INC__