mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
Fix multiple inclusion by "import" when relative paths to modules are specified. Changes so that in the direcotry specified case it fully normalizes the path to be absolute.
[SVN r20354]
This commit is contained in:
@@ -2567,8 +2567,8 @@ rule import ( modules + )
|
||||
if $(d)
|
||||
{
|
||||
# Normalize the path relative to the invocation directory.
|
||||
local p = [ simplify-path-tokens [ split-path $(d:R=$(SUBDIR)) ] ] $(n) ;
|
||||
n = $(p:J=$(SLASH)) ;
|
||||
n = [ root-paths $(n) : $(d:R=$(SUBDIR)) ] ;
|
||||
n = [ root-paths $(n) : [ PWD ] ] ;
|
||||
search = ; # no searching; the path was specified.
|
||||
}
|
||||
|
||||
|
||||
@@ -2567,8 +2567,8 @@ rule import ( modules + )
|
||||
if $(d)
|
||||
{
|
||||
# Normalize the path relative to the invocation directory.
|
||||
local p = [ simplify-path-tokens [ split-path $(d:R=$(SUBDIR)) ] ] $(n) ;
|
||||
n = $(p:J=$(SLASH)) ;
|
||||
n = [ root-paths $(n) : $(d:R=$(SUBDIR)) ] ;
|
||||
n = [ root-paths $(n) : [ PWD ] ] ;
|
||||
search = ; # no searching; the path was specified.
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user