diff options
author | Andy Wingo <wingo@pobox.com> | 2009-08-11 20:25:19 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-08-11 20:25:44 +0200 |
commit | 86cfb42d56907c77e557b760328bfcee0d3be20c (patch) | |
tree | 8672677092f5e5c90bd9821c641bb3b720834b4c /libguile/load.c | |
parent | f5d7662fc86462fef68477fbfed994d2cf228e3e (diff) | |
download | guile-86cfb42d56907c77e557b760328bfcee0d3be20c.tar.gz |
include objcode cookie in the fallback path
* libguile/_scm.h (SCM_OBJCODE_COOKIE): Move the objcode cookie define
here, so that load.c can use it. This is a private header.
* libguile/load.c (FALLBACK_DIR): Include the objcode cookie in the
fallback path. Should fix problems when objcode changes incompatibly
during the 1.9 series.
* libguile/objcodes.c: Adapt to SCM_OBJCODE_COOKIE move.
This should fix http://article.gmane.org/gmane.lisp.guile.devel/9059.
Diffstat (limited to 'libguile/load.c')
-rw-r--r-- | libguile/load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/load.c b/libguile/load.c index 890b0f824..b27bb8241 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -253,7 +253,7 @@ scm_init_load_path () struct passwd *pwd; #endif -#define FALLBACK_DIR "guile/ccache/"SCM_EFFECTIVE_VERSION +#define FALLBACK_DIR "guile/ccache/"SCM_EFFECTIVE_VERSION"/"SCM_OBJCODE_COOKIE if ((e = getenv ("XDG_CACHE_HOME"))) snprintf (cachedir, sizeof(cachedir), "%s" FALLBACK_DIR, e); |