diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 21:36:04 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 22:28:36 +0200 |
| commit | c8bfa5b425c1285cbd4c4a3283f09e2ebb6687f9 (patch) | |
| tree | 35fa13371dbb048c8fc563cfe04a7228bdc2a446 | |
| parent | dfc8bb207104cb3c25c0922508acf6d3c27b69fc (diff) | |
| download | gnu-guix-c8bfa5b425c1285cbd4c4a3283f09e2ebb6687f9.tar gnu-guix-c8bfa5b425c1285cbd4c4a3283f09e2ebb6687f9.tar.gz | |
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.
| -rw-r--r-- | gnu-system.am | 4 | ||||
| -rw-r--r-- | gnu/packages/base.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/ld-wrapper.in (renamed from gnu/packages/ld-wrapper.scm) | 0 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 0382261dc1..5938eeaec7 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -162,7 +162,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/kde.scm \ gnu/packages/key-mon.scm \ gnu/packages/language.scm \ - gnu/packages/ld-wrapper.scm \ gnu/packages/less.scm \ gnu/packages/lesstif.scm \ gnu/packages/libcanberra.scm \ @@ -566,6 +565,9 @@ dist_patch_DATA = \ gnu/packages/patches/xmodmap-asprintf.patch \ gnu/packages/patches/zathura-plugindir-environment-variable.patch +MISC_DISTRO_FILES = \ + gnu/packages/ld-wrapper.in + bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0c12505724..361436157d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -375,7 +375,7 @@ TARGET is not #f, make a wrapper for the cross-linker for TARGET, called ("guile" ,guile) ("bash" ,bash) ("wrapper" ,(search-path %load-path - "gnu/packages/ld-wrapper.scm")))) + "gnu/packages/ld-wrapper.in")))) (arguments `(#:guile ,guile-for-build #:modules ((guix build utils)) diff --git a/gnu/packages/ld-wrapper.scm b/gnu/packages/ld-wrapper.in index 094018de3d..094018de3d 100644 --- a/gnu/packages/ld-wrapper.scm +++ b/gnu/packages/ld-wrapper.in |