Closed jrmarino closed 7 years ago
this one too, probably lots of qt5: http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/20160930_131144/logs/errors/qt5-clucene-5.6.1.log
zrj, I think you are missing code I never committed:
From fa9d6f0b6eb53ebf58b5a3108bfec93268b158a9 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Fri, 4 Mar 2016 19:27:20 +0100
Subject: [PATCH] stash
---
contrib/gcc-5.0/gcc/collect2.c | 10 ++++++++--
gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/gcc-5.0/gcc/collect2.c b/contrib/gcc-5.0/gcc/collect2.c
index b53e151..0dce84f 100644
--- a/contrib/gcc-5.0/gcc/collect2.c
+++ b/contrib/gcc-5.0/gcc/collect2.c
@@ -1001,9 +1001,15 @@ main (int argc, char **argv)
selected_linker = USE_PLUGIN_LD;
}
else if (strcmp (argv[i], "-fuse-ld=bfd") == 0)
- selected_linker = USE_BFD_LD;
+ {
+ selected_linker = USE_BFD_LD;
+ add_prefix (&path, DF_TRUE_BINUTILS_DIR);
+ }
else if (strcmp (argv[i], "-fuse-ld=gold") == 0)
- selected_linker = USE_GOLD_LD;
+ {
+ selected_linker = USE_GOLD_LD;
+ add_prefix (&path, DF_TRUE_BINUTILS_DIR);
+ }
#ifdef COLLECT_EXPORT_LIST
/* These flags are position independent, although their order
diff --git a/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h b/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h
index a9cb942..b7b1dc2 100644
--- a/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h
+++ b/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h
@@ -57,6 +57,7 @@
#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX2"/include/c++/"GCCPOINTVER"/backward"
#undef LOCAL_INCLUDE_DIR
#define GCC_INCLUDE_DIR PREFIX2"/libdata/gcc"GCCSHORTVER
+#define DF_TRUE_BINUTILS_DIR PREFIX2"/libexec/binutils225/elf"
#undef FIXED_INCLUDE_DIR
#undef CROSS_INCLUDE_DIR
#undef TOOL_INCLUDE_DIR
--
2.9.2
this was another approach I was working on:
From 58c8ee1135a3d039829e6e4bb6eba5a13715f9f2 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Wed, 9 Mar 2016 14:46:31 +0100
Subject: [PATCH] stash
---
gnu/usr.bin/cc50/cc_prep/auto-host.h | 2 +-
usr.bin/objformat/Makefile | 2 ++
usr.bin/objformat/objformat.c | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/usr.bin/cc50/cc_prep/auto-host.h b/gnu/usr.bin/cc50/cc_prep/auto-host.h
index 60d5f4f..28b03cd 100644
--- a/gnu/usr.bin/cc50/cc_prep/auto-host.h
+++ b/gnu/usr.bin/cc50/cc_prep/auto-host.h
@@ -45,7 +45,7 @@
/* Define to enable the use of a default linker. */
#ifndef USED_FOR_TARGET
-/* #undef DEFAULT_LINKER */
+#define DEFAULT_LINKER PREFIX1"/bin/ld"
#endif
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index e1d3d13..c7bd3cc 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -28,6 +28,8 @@ LINKS+= ${BINDIR}/objformat ${BINDIR}/elfedit
LINKS+= ${BINDIR}/objformat ${BINDIR}/gprof
LINKS+= ${BINDIR}/objformat ${BINDIR}/incremental-dump
LINKS+= ${BINDIR}/objformat ${BINDIR}/ld
+LINKS+= ${BINDIR}/objformat ${BINDIR}/ld.bfd
+LINKS+= ${BINDIR}/objformat ${BINDIR}/ld.gold
LINKS+= ${BINDIR}/objformat ${BINDIR}/nm
LINKS+= ${BINDIR}/objformat ${BINDIR}/objcopy
LINKS+= ${BINDIR}/objformat ${BINDIR}/objdump
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index aa4937a..cf80d06 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -80,6 +80,8 @@ static struct command commands[] = {
{"c++filt", BINUTILS},
{"elfedit", BINUTILS},
{"gprof", BINUTILS},
+ {"ld.bfd", BINUTILS},
+ {"ld.gold", BINUTILS},
{"nm", BINUTILS},
{"objcopy", BINUTILS},
{"objdump", BINUTILS},
--
2.9.2
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/20160930_131144/logs/errors/qt5-qml-5.6.1.log
zrj, can you check it out?