mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-30 16:14:09 +00:00
ecc5e41618
Add the new release and rebase the local patches. Add a new patch which resolves a build issue on macOS. https://sourceware.org/pipermail/binutils/2024-January/132213.html Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 3f902fa5e378510db27583dd6900fd5326d35f9e Mon Sep 17 00:00:00 2001
|
|
From: Sven Rebhan <odinshorse@googlemail.com>
|
|
Date: Mon, 8 Aug 2022 20:46:29 +1200
|
|
Subject: [PATCH] sysroot
|
|
|
|
Always try to prepend the sysroot prefix to absolute filenames first.
|
|
|
|
http://bugs.gentoo.org/275666
|
|
http://sourceware.org/bugzilla/show_bug.cgi?id=10340
|
|
|
|
Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
|
|
---
|
|
ld/ldfile.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/ld/ldfile.c
|
|
+++ b/ld/ldfile.c
|
|
@@ -554,18 +554,25 @@
|
|
directory first. */
|
|
if (!entry->flags.maybe_archive)
|
|
{
|
|
- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
|
|
+ /* For absolute pathnames, try to always open the file in the
|
|
+ sysroot first. If this fails, try to open the file at the
|
|
+ given location. */
|
|
+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
|
|
+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
|
|
+ && ld_sysroot)
|
|
{
|
|
char *name = concat (ld_sysroot, entry->filename,
|
|
(const char *) NULL);
|
|
if (ldfile_try_open_bfd (name, entry))
|
|
{
|
|
entry->filename = name;
|
|
+ entry->flags.sysrooted = true;
|
|
return true;
|
|
}
|
|
free (name);
|
|
}
|
|
- else if (ldfile_try_open_bfd (entry->filename, entry))
|
|
+
|
|
+ if (ldfile_try_open_bfd (entry->filename, entry))
|
|
return true;
|
|
|
|
if (IS_ABSOLUTE_PATH (entry->filename))
|