From 37a594434003d3b5a617ca53e430033eedea2452 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 30 Sep 2002 21:23:55 +0000
Subject: Adapt for buildlink2 usage, and fix up CFLAGS/CXXFLAGS so that they
 don't carry optimizations for the native compiler.

---
 cross/COMMON/cross.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'cross')

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 87258eb5dae..7483010c946 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,7 +1,9 @@
-#	$NetBSD: cross.mk,v 1.23 2001/12/15 20:25:35 agc Exp $
+#	$NetBSD: cross.mk,v 1.24 2002/09/30 21:23:55 jlam Exp $
 
 # Shared definitions for building a cross-compile environment.
 
+.include "../../mk/bsd.prefs.mk"
+
 DISTNAME=		cross-${TARGET_ARCH}-${DISTVERSION}
 CATEGORIES+=		cross lang
 USE_CROSSBASE=		yes
@@ -28,10 +30,18 @@ pre-install-dirs:
 BINUTILS_DISTNAME=	binutils-2.9.1
 BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
 
+# Don't use optimizations taken from /etc/mk.conf for the native compiler
+CFLAGS=			# empty
+CXXFLAGS=		# empty
+
 CROSS_DISTFILES+=	${BINUTILS_DISTNAME}.tar.gz
 MASTER_SITES+=		${MASTER_SITE_GNU:=binutils/}
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
+.if defined(USE_BUILDLINK2)
+.  include "../../cross/binutils/buildlink2.mk"
+.else
 DEPENDS+=		cross-binutils>=2.9.1.1:../../cross/binutils
+.endif
 PLIST_PRE+=		${COMMON_DIR}/PLIST-binutils
 
 AS_FOR_TARGET=		${BINUTILS_WRKSRC}/gas/as-new
-- 
cgit v1.2.3