From 82dc2b9af975ca79abf5e9c48f77ed4ffd7ccea5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 26 Sep 2012 18:27:04 +0200
Subject: distro: Add an `ld' wrapper, to pass missing `-rpath' flags.

* distro/ld-wrapper.scm: New file.
* Makefile.am (MODULES): Add it.

* distro/base.scm (ld-wrapper-boot3): New variable.
  (%boot3-inputs): Add LD-WRAPPER-BOOT3.
  (bash-final, guile-final, ld-wrapper): New final.
  (%final-inputs): Use BASH-FINAL; add LD-WRAPPER.
  (gcc-4.7): Remove the `-rpath' trick from the `lib' spec string.
---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 4845a48579..3de64a4edd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,8 @@ MODULES =					\
   guix/packages.scm				\
   guix.scm					\
   distro.scm					\
-  distro/base.scm
+  distro/base.scm				\
+  distro/ld-wrapper.scm
 
 GOBJECTS = $(MODULES:%.scm=%.go)
 
-- 
cgit v1.2.3