boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 13:22:11 +00:00
Code Issues Projects Releases Wiki Activity

Robustify some code.

Browse Source 
[SVN r19898]
This commit is contained in:
Vladimir Prus
2003-09-01 13:57:35 +00:00
parent 3f9419e4a7
commit bb6cc49508
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
new/targets.jam
View File

@@ -656,7 +656,7 @@ rule find ( id : current-location )
# The project used for finding main targets and for providing base directory
# for file paths.
local base-project = [ project.find $(project-part) : $(current-location) ] ;
# Interpret target-part as project-id
if ! $(have-project-reference)
{
@@ -668,7 +668,7 @@ rule find ( id : current-location )
}
# Interpret target-name as name of main target
if ! $(target)
if ! $(target) && $(base-project)
{
local project-target = [ project.target $(base-project) ] ;
if [ $(project-target).has-main-target $(target-part) ]
@@ -677,7 +677,7 @@ rule find ( id : current-location )
}
}
if ! $(target) && ! $(have-project-reference)
if ! $(target) && ! $(have-project-reference) && $(base-project)
{
local location = [ path.root $(target-part)
[ project.attribute $(base-project) source-location ] ] ;

6
v2/build/targets.jam
View File

@@ -656,7 +656,7 @@ rule find ( id : current-location )
# The project used for finding main targets and for providing base directory
# for file paths.
local base-project = [ project.find $(project-part) : $(current-location) ] ;
# Interpret target-part as project-id
if ! $(have-project-reference)
{
@@ -668,7 +668,7 @@ rule find ( id : current-location )
}
# Interpret target-name as name of main target
if ! $(target)
if ! $(target) && $(base-project)
{
local project-target = [ project.target $(base-project) ] ;
if [ $(project-target).has-main-target $(target-part) ]
@@ -677,7 +677,7 @@ rule find ( id : current-location )
}
}
if ! $(target) && ! $(have-project-reference)
if ! $(target) && ! $(have-project-reference) && $(base-project)
{
local location = [ path.root $(target-part)
[ project.attribute $(base-project) source-location ] ] ;