From 70a00e368e7a879efe59dc9d9a24dc39c0dd8856 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sun, 30 Aug 2015 13:44:02 -0400 Subject: [PATCH] Have package-inferred-system use component-pathname as top rather than system-source-directory. Fixes lp#1485276 --- doc/asdf.texinfo | 6 ++++++ package-inferred-system.lisp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo index b2b6f8236..206c285ad 100644 --- a/doc/asdf.texinfo +++ b/doc/asdf.texinfo @@ -1926,6 +1926,12 @@ and has many options that prove useful in this context, such as @code{:use-reexport} and @code{:mix-reexport} that allow for ``inheritance'' of symbols being exported. +Note that starting with ASDF 3.1.5.6 only, ASDF will look for source files under +the @code{component-pathname} as specified via the @code{:pathname} option, +whereas earlier versions ignore this option and use the @code{system-source-directory} +where the @file{.asd} file resides. + + @node The object model of ASDF, Controlling where ASDF searches for systems, Defining systems with defsystem, Top @comment node-name, next, previous, up @chapter The Object model of ASDF diff --git a/package-inferred-system.lisp b/package-inferred-system.lisp index 1ac8a3b82..4b6a8ea54 100644 --- a/package-inferred-system.lisp +++ b/package-inferred-system.lisp @@ -111,7 +111,7 @@ otherwise return a default system name computed from PACKAGE-NAME." (unless (equal primary system) (let ((top (find-system primary nil))) (when (typep top 'package-inferred-system) - (if-let (dir (system-source-directory top)) + (if-let (dir (component-pathname top)) (let* ((sub (subseq system (1+ (length primary)))) (f (probe-file* (subpathname dir sub :type "lisp") :truename *resolve-symlinks*))) -- GitLab