nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ld-wrapper: Use a hard-coded self-reference instead of $0. 

* gnu/packages/ld-wrapper.scm: Use @SELF@ instead of $0.  This is so
  that the .go file is found even when the wrapper is invoked via a
  symlink to it.
* gnu/packages/base.scm (make-ld-wrapper): Substitute @SELF@.
This commit is contained in:
Ludovic Courtès 2015-04-03 22:27:45 +02:00
parent 8fdd410160
commit 9bab6bea86
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/base.scm
View File

@ -393,6 +393,8 @@ wrapper uses GUILE and BASH."
(mkdir-p bin) (mkdir-p bin)
(copy-file (assoc-ref %build-inputs "wrapper") ld) (copy-file (assoc-ref %build-inputs "wrapper") ld)
(substitute* ld (substitute* ld
(("@SELF@")
ld)
(("@GUILE@") (("@GUILE@")
(string-append (assoc-ref %build-inputs "guile") (string-append (assoc-ref %build-inputs "guile")
"/bin/guile")) "/bin/guile"))

2
gnu/packages/ld-wrapper.scm
View File

@ -8,7 +8,7 @@
# .go file (see <http://bugs.gnu.org/12519>). # .go file (see <http://bugs.gnu.org/12519>).
main="(@ (gnu build-support ld-wrapper) ld-wrapper)" main="(@ (gnu build-support ld-wrapper) ld-wrapper)"
exec @GUILE@ -c "(load-compiled \"$0.go\") (apply $main (cdr (command-line)))" "$@" exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@"
!# !#
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>