Mercurial > gub

changeset 5571:615bfea34eea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
freebsd::guile: remove LD_LIBRARY_PATH setting. Fixes x86 build. Keeping change minimal to avoid testing all other guiles again. IWBN to eradicate LD_LIBRARY_PATH from guile.py entirely.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Thu, 17 Sep 2009 12:06:41 +0200
parents 308c7ad63a05
children f92e0b7b400a
files gub/specs/guile.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/guile.py	Thu Sep 17 10:17:19 2009 +0200
+++ b/gub/specs/guile.py	Thu Sep 17 12:06:41 2009 +0200
@@ -176,6 +176,7 @@
     def compile_command (self):
         # FIXME: when not x-building, guile runs guile without
         # setting the proper LD_LIBRARY_PATH.
+        # FIXME: try removing this and using cross_compiling=yes fix
         return ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:$LD_LIBRARY_PATH;'
                 + Guile.compile_command (self))
 
@@ -192,6 +193,8 @@
 ''')
     def configure_command (self):
         return (Guile.configure_command (self)
+                # FIXME: eradicate LD_LIBRARY_PATH from guile.py
+                .replace ('LD_LIBRARY_PATH=%(system_prefix)s/lib:${LD_LIBRARY_PATH-/foe} ', '')
                 + Guile.configure_flags (self)
                 + Guile.configure_variables (self))