Re: icc fails with recent TLS work

[Andreas Hauser <andy@xxxxxxxxxxxxxxx>]

andy wrote @ 23 Jul 2005 20:07:06 -0000:
> Joerg, guessed right, it used the old rtld.
> 
> cd /usr/libexec
> mv ld-elf.so.1 ld-elf.so.1.old
> ln -s ld-elf.so.2 ld-elf.so.1 
> 
> fixed it.

Or better, fix the port.

Andy

Index: files/ld.c
===================================================================
RCS file: /home/ncvs/ports/lang/icc/files/ld.c,v
retrieving revision 1.13
diff -u -p -r1.13 ld.c
--- files/ld.c	16 Nov 2004 20:14:46 -0000	1.13
+++ files/ld.c	23 Jul 2005 23:23:55 -0000
@@ -268,7 +268,9 @@ main(int argc, char *argv[], char *envp[
 
 		/* Switch Linux stuff to FreeBSD counterparts. */
 		if (ARGCMP(i, "/lib/ld-linux.so.2")) {
-#if __FreeBSD_version >= 501105
+#if __DragonFly_version >= 130002
+			addarg(&al, "/usr/libexec/ld-elf.so.2");
+#elif __FreeBSD_version >= 501105
 			addarg(&al, "/libexec/ld-elf.so.1");
 #else
 			addarg(&al, "/usr/libexec/ld-elf.so.1");