summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2005-02-05 11:00:55 +0000
committerespie <espie@openbsd.org>2005-02-05 11:00:55 +0000
commit6aeb3797d5560285bc2f25a5a7585d43ff06d07c (patch)
tree3842e56e5e40f51e068469cd07391f2327094d9a
parentintroduce explicit MAKE_FLAGS variable, which has no surprising behavior (diff)
downloadwireguard-openbsd-6aeb3797d5560285bc2f25a5a7585d43ff06d07c.tar.xz
wireguard-openbsd-6aeb3797d5560285bc2f25a5a7585d43ff06d07c.zip
-dynamic-linker ld.so is NOT a normal object file. Fixes issues in trying
to build a gcc3 sparc. (reviewed and accepted upstream)
-rw-r--r--gnu/egcs/gcc/collect2.c5
-rw-r--r--gnu/usr.bin/gcc/gcc/collect2.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/gnu/egcs/gcc/collect2.c b/gnu/egcs/gcc/collect2.c
index cd7ee2747e7..a08cbaf17e3 100644
--- a/gnu/egcs/gcc/collect2.c
+++ b/gnu/egcs/gcc/collect2.c
@@ -1314,6 +1314,11 @@ main (argc, argv)
ld1--;
ld2--;
}
+ if (!strcmp (arg, "-dynamic-linker") && argv[1])
+ {
+ ++argv;
+ *ld1++ = *ld2++ = *argv;
+ }
break;
case 'l':
diff --git a/gnu/usr.bin/gcc/gcc/collect2.c b/gnu/usr.bin/gcc/gcc/collect2.c
index 08f54113dd8..68c012f9d76 100644
--- a/gnu/usr.bin/gcc/gcc/collect2.c
+++ b/gnu/usr.bin/gcc/gcc/collect2.c
@@ -1127,6 +1127,11 @@ main (argc, argv)
ld1--;
ld2--;
}
+ if (!strcmp (arg, "-dynamic-linker") && argv[1])
+ {
+ ++argv;
+ *ld1++ = *ld2++ = *argv;
+ }
break;
case 'l':