mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: Change ld-wrapper extension from .scm to .in.
* gnu/packages/ld-wrapper.scm: Rename to... * gnu/packages/ld-wrapper.in: ... this. * gnu/packages/base.scm (make-ld-wrapper): Adjust "wrapper" input accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Remove ld-wrapper.scm. (MISC_DISTRO_FILES): New variable.
This commit is contained in:
parent
dfc8bb2071
commit
c8bfa5b425
3 changed files with 4 additions and 2 deletions
|
@ -162,7 +162,6 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/kde.scm \
|
gnu/packages/kde.scm \
|
||||||
gnu/packages/key-mon.scm \
|
gnu/packages/key-mon.scm \
|
||||||
gnu/packages/language.scm \
|
gnu/packages/language.scm \
|
||||||
gnu/packages/ld-wrapper.scm \
|
|
||||||
gnu/packages/less.scm \
|
gnu/packages/less.scm \
|
||||||
gnu/packages/lesstif.scm \
|
gnu/packages/lesstif.scm \
|
||||||
gnu/packages/libcanberra.scm \
|
gnu/packages/libcanberra.scm \
|
||||||
|
@ -566,6 +565,9 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/xmodmap-asprintf.patch \
|
gnu/packages/patches/xmodmap-asprintf.patch \
|
||||||
gnu/packages/patches/zathura-plugindir-environment-variable.patch
|
gnu/packages/patches/zathura-plugindir-environment-variable.patch
|
||||||
|
|
||||||
|
MISC_DISTRO_FILES = \
|
||||||
|
gnu/packages/ld-wrapper.in
|
||||||
|
|
||||||
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
|
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
|
||||||
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
|
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
|
||||||
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
|
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
|
||||||
|
|
|
@ -375,7 +375,7 @@ (define* (make-ld-wrapper name #:key binutils
|
||||||
("guile" ,guile)
|
("guile" ,guile)
|
||||||
("bash" ,bash)
|
("bash" ,bash)
|
||||||
("wrapper" ,(search-path %load-path
|
("wrapper" ,(search-path %load-path
|
||||||
"gnu/packages/ld-wrapper.scm"))))
|
"gnu/packages/ld-wrapper.in"))))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:guile ,guile-for-build
|
`(#:guile ,guile-for-build
|
||||||
#:modules ((guix build utils))
|
#:modules ((guix build utils))
|
||||||
|
|
Loading…
Reference in a new issue