From a3e8d45c1e43e49ef74e00b54034a1409c84034a Mon Sep 17 00:00:00 2001
From: netchild <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/files/ld.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lang/icc/files')

diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c
index 66420ce..2f13569 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.1