[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-30-gadf861
From: |
Ludovic Courtès |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-30-gadf8616 |
Date: |
Tue, 22 Nov 2011 09:09:40 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=adf8616fabbf3248cfbe4f075b5f2c02fed9e5c2
The branch, stable-2.0 has been updated
via adf8616fabbf3248cfbe4f075b5f2c02fed9e5c2 (commit)
from a0a8dd625469f5b6194e7ace9146e5f10b9b4016 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit adf8616fabbf3248cfbe4f075b5f2c02fed9e5c2
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 22 10:09:27 2011 +0100
Leave $GUILE_LOAD_COMPILED_PATH unchanged when cross-compiling.
* meta/uninstalled-env.in: Don't define $GUILE_LOAD_COMPILED_PATH when
cross-compiling.
-----------------------------------------------------------------------
Summary of changes:
meta/uninstalled-env.in | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 2276b4a..24a05f9 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -71,22 +71,27 @@ else
fi
export GUILE_LOAD_PATH
-if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
+# When cross-compiling, let $GUILE_FOR_BUILD use its own .go files since
+# the ones that are being built may be incompatible.
+if test "@cross_compiling@" = "no"
then
-
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
-else
- for d in "/module" "/guile-readline" ""
- do
- # This hair prevents double inclusion.
- # The ":" prevents prefix aliasing.
- case x"$GUILE_LOAD_COMPILED_PATH" in
- x*${top_builddir}${d}:*) ;;
- x*${top_builddir}${d}) ;;
- *)
GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
- esac
- done
+ if test "x$GUILE_LOAD_COMPILED_PATH" = "x"
+ then
+
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
+ else
+ for d in "/module" "/guile-readline" ""
+ do
+ # This hair prevents double inclusion.
+ # The ":" prevents prefix aliasing.
+ case x"$GUILE_LOAD_COMPILED_PATH" in
+ x*${top_builddir}${d}:*) ;;
+ x*${top_builddir}${d}) ;;
+ *)
GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
+ esac
+ done
+ fi
+ export GUILE_LOAD_COMPILED_PATH
fi
-export GUILE_LOAD_COMPILED_PATH
# Don't look in installed dirs for guile modules
if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-30-gadf8616,
Ludovic Courtès <=