From 3edecb084664b1586a72484591d70b7a34f2ad39 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 5 Dec 2004 04:08:22 +0000
Subject: Fix previous commit. GDB_CROSS_DEBUGGER needs to be defined for all
 subdirectories.

---
 gnu/usr.bin/gdb/Makefile.inc    |  4 ++++
 gnu/usr.bin/gdb/libgdb/Makefile | 10 +---------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'gnu/usr.bin')

diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index 2f5a448dbf17..32a86222afed 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -19,6 +19,10 @@ OBJ_GDB= ${OBJ_ROOT}/gdb
 TARGET_ARCH?= ${MACHINE_ARCH}
 TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH}
 
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+GDB_CROSS_DEBUGGER=
+.endif
+
 .if !defined(INFO)
 
 .PATH:	${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi	\
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index 25b7bac03ed3..5a733aff283b 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
 TARGET_ARCH?= ${MACHINE_ARCH}
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-GDB_CROSS_DEBUGGER=
-.endif
 
 LIB=	gdb
 INTERNALLIB=
@@ -52,12 +49,7 @@ SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
 	valarith.c valops.c valprint.c values.c varobj.c \
 	wrapper.c ${LIBSRCS}
 
-TARGET_ARCH?= ${MACHINE_ARCH}
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-GDB_CROSS_DEBUGGER=
-.endif
-
-.if !defined(GDB_CROSS_DEBUGGER)
+.if ${TARGET_ARCH} == ${MACHINE_ARCH}
 _fork_child= fork-child.c
 _infptrace= infptrace.c
 _inftarg= inftarg.c
-- 
cgit v1.3