me
/
guix
Archived
1
0
Fork 0
Code

gnu: smalltalk: Find glibc even when cross-compiling. 

glibc is named "cross-libc" instead of "libc" when cross-compiling. Smalltalk
still fails to cross-compile though.

* gnu/packages/smalltalk.scm
  (smalltalk)[arguments]{phases}<#:fix-libc>: Also search for
  "cross-libc" instead of only "libc" in 'inputs'.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
Maxime Devos 2021-05-31 14:07:50 +02:00 committed by Mathieu Othacehe
parent 961a8f1302
commit f50a88c1fa
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/smalltalk.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -103,7 +104,11 @@
#t)) #t))
(add-before 'configure 'fix-libc (add-before 'configure 'fix-libc
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))) (let ((libc (or (assoc-ref inputs "libc")
;; When cross-compiling, the input
;; is named "cross-libc" instead of
;; simply "libc".
(assoc-ref inputs "cross-libc"))))
(substitute* "libc.la.in" (substitute* "libc.la.in"
(("@LIBC_SO_NAME@") "libc.so") (("@LIBC_SO_NAME@") "libc.so")
(("@LIBC_SO_DIR@") (string-append libc "/lib")))) (("@LIBC_SO_DIR@") (string-append libc "/lib"))))