summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--gnu-system.am4
-rw-r--r--gnu/packages/base.scm2
-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