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

Bugfix: build-dir was broken when building from child projects.

Browse Source 
[SVN r17478]
This commit is contained in:
Vladimir Prus
2003-02-17 08:36:45 +00:00
parent 846928e81a
commit 338bf290e6
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/build/project.jam
View File

@@ -380,8 +380,12 @@ local rule initialize (
local parent-build-dir = [ $(pattributes).get build-dir ] ;
if $(parent-build-dir)
{
local parent-dir = [ path.parent $(parent) ] ;
local our-dir = [ path.parent $(jamfile) ] ;
# Have to compute relative path from parent dir to our dir
# Convert both paths to absolute, since we cannot
# find relative path from ".." to "."
local pwd = [ path.pwd ] ;
local parent-dir = [ path.root [ path.parent $(parent) ] $(pwd) ] ;
local our-dir = [ path.root [ path.parent $(jamfile) ] $(pwd) ] ;
$(attributes).set build-dir : [ path.join $(parent-build-dir)
[ path.relative $(our-dir) $(parent-dir) ] ] : exact ;
}
@@ -424,7 +428,7 @@ rule project-attributes ( location )
{
specification = [ property.translate-paths $(specification)
: $(self.location) ] ;
specification = [ property.make $(specification) ] ;
specification = [ property.make $(specification) ] ;
result = [ property-set.create $(specification) ] ;
# If we have inherited properties, need to refine them with the