pyrox.dev
1From bb3277895d3bd77bcacb7c489ebb1390478bbc12 Mon Sep 17 00:00:00 2001
2From: John Ericson <John.Ericson@Obsidian.Systems>
3Date: Thu, 17 Jul 2025 11:00:07 -0400
4Subject: [PATCH 2/2] Force regular dirs
5
6Override directories in libgcc so they are normal $out/lib and
7$dev/include. This is not suitable for upstreaming, but is done on top
8of a different patch which is, and which makes this smaller.
9
10---
11 libgcc/Makefile.in | 6 +++---
12 libgcc/configure.ac | 3 ---
13 2 files changed, 3 insertions(+), 6 deletions(-)
14
15diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
16index 4661c36703d..986cd035148 100644
17--- a/libgcc/Makefile.in
18+++ b/libgcc/Makefile.in
19@@ -202,10 +202,10 @@ STRIP = @STRIP@
20 STRIP_FOR_TARGET = $(STRIP)
21
22 # Used to install the shared libgcc.
23-slibdir = @slibdir@
24+slibdir = $(libdir)
25 # Maybe used for DLLs on Windows targets.
26-toolexecdir = @toolexecdir@
27-toolexeclibdir = @toolexeclibdir@
28+toolexecdir = $(bindir)
29+toolexeclibdir = $(libdir)
30
31 export AR_FOR_TARGET
32 export AR_CREATE_FOR_TARGET
33diff --git a/libgcc/configure.ac b/libgcc/configure.ac
34index 5fdac5d95f2..89044cb65c9 100644
35--- a/libgcc/configure.ac
36+++ b/libgcc/configure.ac
37@@ -479,9 +479,6 @@ if test x"$enable_as_accelerator_for" != x; then
38 accel_dir_suffix=/accel/${target_noncanonical}
39 real_host_noncanonical=${enable_as_accelerator_for}
40 fi
41-# Directory in which the compiler finds libraries etc.
42-libdir=${orig_libdir}/gcc/${real_host_noncanonical}/'$(version)'${accel_dir_suffix}
43-includedir=${libdir}/include
44
45 if test x"$enable_offload_targets" != x; then
46 extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"
47--
482.47.2
49