From a5b66548d372a6621fc88ae99875e06aa23d7bfe Mon Sep 17 00:00:00 2001
From: Piper McCorkle <contact@piperswe.me>
Date: Tue, 7 Oct 2025 06:17:07 +0000
Subject: [PATCH] gcc: add glibc to rpath (#36)

This way, the binaries glibc builds will actually get linked to our libc.so at runtime, instead of the system one.

Reviewed-on: https://git.auxolotl.org/auxolotl/labs/pulls/36
Reviewed-by: vlinkz <vlinkz@snowflakeos.org>
Co-authored-by: Piper McCorkle <contact@piperswe.me>
Co-committed-by: Piper McCorkle <contact@piperswe.me>
---
 tidepool/npins/sources.json                                   | 4 ++--
 .../src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix | 1 +
 .../src/packages/foundation/gcc/versions/13.2.0-stage2.nix    | 1 +
 .../src/packages/foundation/gcc/versions/13.2.0-stage3.nix    | 1 +
 .../src/packages/foundation/gcc/versions/13.2.0-stage4.nix    | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tidepool/npins/sources.json b/tidepool/npins/sources.json
index adeac94..d26c375 100644
--- a/tidepool/npins/sources.json
+++ b/tidepool/npins/sources.json
@@ -8,9 +8,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f39cac8caec87b3d93bd2f941bcf8768dc46d912",
+      "revision": "187b21870e60c650fb7f08c00b99e6f648c53198",
       "url": null,
-      "hash": "sha256-LgdIew95Y3PBTTj8vV70gbWIyMPf3Fl30cM2WPWylNk="
+      "hash": "sha256-UZpbkervrxpUHgIEDHExevG7Aza36vjLMZFagzTJqLA="
     },
     "lib": {
       "type": "Git",
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
index d15ea94..cd7a9da 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
@@ -9,6 +9,7 @@ let
 
   gccFlags = [
     "-Wl,-dynamic-linker=${foundation.stage1-musl}/lib/libc.so"
+    "-Wl,-rpath,${foundation.stage1-musl}/lib"
     "-B${foundation.stage1-musl}/lib"
   ];
 in
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
index 704c68c..69993d8 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
@@ -31,6 +31,7 @@ let
 
   gccFlags = [
     "-Wl,-dynamic-linker=${config.deps.host.glibc.dynamicLinker}"
+    "-Wl,-rpath,${config.deps.host.glibc.package}/lib"
     "-L${config.deps.host.glibc.package}/lib"
     "-B${config.deps.host.glibc.package}/lib"
     "-L${config.package.outPath}${libPrefix}/lib"
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
index fee2817..2425cdd 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
@@ -22,6 +22,7 @@ let
 
   gccFlags = [
     "-Wl,-dynamic-linker=${config.deps.host.glibc.dynamicLinker}"
+    "-Wl,-rpath,${config.deps.host.glibc.package}/lib"
     "-L${config.deps.host.glibc.package}/lib"
     "-B${config.deps.host.glibc.package}/lib"
     "-L${config.package.outPath}/lib"
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
index 8e8151a..56247a7 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
@@ -22,6 +22,7 @@ let
 
   gccFlags = [
     "-Wl,-dynamic-linker=${config.deps.host.glibc.dynamicLinker}"
+    "-Wl,-rpath,${config.deps.host.glibc.package}/lib"
     "-L${config.deps.host.glibc.package}/lib"
     "-B${config.deps.host.glibc.package}/lib"
     "-L${config.package.outPath}/lib"