mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
Boost Build cleanup - project-rules.using() & project-rules.import() rules now restore the original 'current project' reference the same way.
[SVN r79876]
This commit is contained in:
@@ -907,6 +907,8 @@ module project-rules
|
||||
import project ;
|
||||
import toolset ;
|
||||
|
||||
local saved-project = [ modules.peek project : .current-project ] ;
|
||||
|
||||
# Temporarily change the search path so the module referred to by
|
||||
# 'using' can be placed in the same directory as Jamfile. User will
|
||||
# expect the module to be found even though the directory is not in
|
||||
@@ -925,7 +927,7 @@ module project-rules
|
||||
# get set as the 'current' project). Restore the correct value so any
|
||||
# main targets declared after this do not get mapped to the loaded
|
||||
# module's project.
|
||||
modules.poke project : .current-project : [ project.target $(caller) ] ;
|
||||
modules.poke project : .current-project : $(saved-project) ;
|
||||
}
|
||||
|
||||
rule import ( * : * : * )
|
||||
|
||||
Reference in New Issue
Block a user