summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-12-15 15:34:34 +0200
committerEfraim Flashner <efraim@flashner.co.il>2023-12-16 18:05:57 +0200
commit1954a1e33de4bb4be7f91393fd4842b37f6a4f52 (patch)
tree70c646b92159e3b3b64140cdecf161762ba47694
parent7b949bc318ef4ce3bfefa00962440d49aac82919 (diff)
gnu: fpc: Patch more dynamic-linker paths.
* gnu/packages/pascal.scm (fpc)[arguments]: Patch more paths to the dynamic-linker in the 'configure phase. Change-Id: I0eebf1271d24e22839db0a8fd96385408067fdbf
-rw-r--r--gnu/packages/pascal.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm
index 47fec7f417..c6ae1bf3dd 100644
--- a/gnu/packages/pascal.scm
+++ b/gnu/packages/pascal.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -161,9 +162,14 @@
(search-input-file inputs ,(glibc-dynamic-linker)))
(("/lib64/ld-linux-x86-64.so.2")
(search-input-file inputs ,(glibc-dynamic-linker)))
- ; TODO: /lib/ld-linux-armhf.so.3
- ; TODO: /lib/ld-linux-aarch64.so.1
- ; TODO: /lib64/ld64.so.2
+ (("/lib/ld.so.1")
+ (search-input-file inputs ,(glibc-dynamic-linker)))
+ (("/lib64/ld64.so.[12]")
+ (search-input-file inputs ,(glibc-dynamic-linker)))
+ (("/lib/ld-linux(-armhf)?.so.3")
+ (search-input-file inputs ,(glibc-dynamic-linker)))
+ (("/lib/ld-linux-aarch64.so.1")
+ (search-input-file inputs ,(glibc-dynamic-linker)))
;; Add glibc to ld's search path.
(("if \\(isdll\\) then")
(string-append