From 453e18e24e909a8d0118bd18ce8023667c30e00b Mon Sep 17 00:00:00 2001
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Fri, 7 May 2004 11:54:55 +0000
Subject: icc 8.0.066 now adds "-m elf_i386" in some circumstances. Remove this
 part of the command line in the ld wrapper.

Noticed by:	Morten Rodal <morten@rodal.no>
---
 lang/icc/Makefile   | 1 +
 lang/icc/files/ld.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'lang/icc')

diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index ea9557e1e9bd..5a8df6113e98 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icc
 PORTVERSION=	8.0.066
+PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
 DISTNAME=	l_cc_pc_${PORTVERSION:C/\.p.+$//}
diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c
index 66420cebfeae..2f135697e1d5 100644
--- a/lang/icc/files/ld.c
+++ b/lang/icc/files/ld.c
@@ -184,7 +184,9 @@ main(int argc, char *argv[], char *envp[])
 
 	for (i = 0; i < argc; i++) {
 	 	if (ARGCMP(i, "-CPLUSPLUS") || ARGCMP(i, "-MT") ||
-		    ARGCMP(i, "-PIC"))
+		    ARGCMP(i, "-PIC") ||
+		    (ARGCMP(i, "-m") && i<argc-1 && ARGCMP(i+1, "elf_i386")) ||
+		    (ARGCMP(i, "elf_i386") && i != 0 && ARGCMP(i-1, "-m")))
 			continue;
 
 		/* prepend "-melf_i386" to the commandline */
-- 
cgit v1.2.3