From db7c136a2c72809de7867e7a7f3ce83c4b3263d0 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 1 Oct 2004 20:52:25 +0000
Subject: Remove MIPSpro bits that added -n32 or -64 depending on the ABI; this
 handling has been moved into mk/compiler/mipspro.mk.

---
 lang/perl5/Makefile  | 10 +---------
 lang/perl58/Makefile | 14 ++------------
 2 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'lang')

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 6bc0cc8c481..9d82369b764 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2004/08/27 06:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.86 2004/10/01 20:52:25 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -57,14 +57,6 @@ CONFIGURE_ARGS+=	-Dinstallsiteman1dir="${VIEWBASE}/man/man1"
 
 MKPIC?=			yes
 
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-.  if ${ABI} == "32"
-CONFIGURE_ARGS+=        -Dcc='cc -n32'
-.  elif ${ABI} == "64"
-CONFIGURE_ARGS+=        -Dcc='cc -64'
-.  endif
-.endif
-
 .if ${OPSYS} == "IRIX" && ${ABI} == "64"
 CONFIGURE_ARGS+=	-Duse64bitint
 .endif
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 7d62af9dd4e..921f7878a14 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/09/08 11:59:09 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/10/01 20:52:26 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	-Duseithreads
 
 MKPIC?=		yes
 
-CONFIGURE_ARGS+=	-Dcc="${PERL5_CC}"
+CONFIGURE_ARGS+=	-Dcc="${CC}"
 MAKE_ENV+=		LANG=""
 
 .if ${OPSYS} == "Interix"
@@ -189,16 +189,6 @@ MKPIC=		no
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Mmipspro)
-.  if ${ABI} == "32"
-PERL5_CC=		${CC:T} -n32
-.  elif ${ABI} == "64"
-PERL5_CC=		${CC:T} -64
-.  endif
-.else
-PERL5_CC=		${CC:T}
-.endif
-
 .if ${OPSYS} == "IRIX" && ${ABI} == "64"
 CONFIGURE_ARGS+=	-Duse64bitint
 .endif
-- 
cgit v1.2.3