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

Bugfixes for my last round of refactorings. NEEDLIBS was getting dropped from toolsets that use command files.

Browse Source 
[SVN r20786]
This commit is contained in:
Dave Abrahams
2003-11-11 18:42:43 +00:00
parent 283daad33f
commit da610ce6b1
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
v1/boost-base.jam
View File

@@ -189,10 +189,20 @@ rule main-from-objects ( targets * : objects * : type )
gFILES($(targets[1])) = $(targets) $(extra-files) ;
}
rule .do-link ( targets + : sources + : type )
{
# Prepare NEEDLIBS for use by the toolsets' link action (e.g. for
# invoking with-command-file)
local NEEDLIBS = [ on $(<) return $(NEEDLIBS) ] ;
return [ Link-action $(targets) : $(sources) : $(type) ] ;
}
rule Link-EXE
{
# N.B. By the time this rule is invoked, we had better have gRUN_PATH completely set.
local extra-files = [ Link-action $(<) : $(>) : EXE ] ;
local extra-files = [ .do-link $(<) : $(>) : EXE ] ;
RUN_PATH on $(<) = [ join [ unique $(gRUN_PATH($(<))) $(gTOOLSET_LIB_PATH) ] : $(SPLITPATH) ] ;
if $(UNIX)
{
@@ -216,7 +226,7 @@ rule Link-DLL
}
}
return [ Link-action $(<) : $(>) : DLL ] ;
return [ .do-link $(<) : $(>) : DLL ] ;
}
rule Aix-Implib-Action
@@ -1651,7 +1661,7 @@ else
}
# Helper
rule depend-on-libraries ( targets + : libs * )
rule depend-on-libs ( targets + : libs * )
{
LIBPATH on $(<) += [ unique $(gLOCATE($(>))) ] ;
DEPENDS $(<) : $(>) ;
@@ -1662,9 +1672,9 @@ rule depend-on-libraries ( targets + : libs * )
rule depend-on-static ( targets + : static-libs * )
{
NEEDLIBS = [ unique $(NEEDLIBS) $(>) ] ;
local NEEDLIBS = [ unique $(NEEDLIBS) $(>) ] ;
NEEDLIBS on $(<) = [ on $(<) return [ unique $(NEEDLIBS) $(>) ] ] ;
depend-on-libraries $(targets) : $(static-libs) ;
depend-on-libs $(targets) : $(static-libs) ;
}
rule depend-on-shared ( targets + : dlls-and-import-libs * )
@@ -1685,7 +1695,7 @@ rule depend-on-shared ( targets + : dlls-and-import-libs * )
FINDLIBS on $(<) += [ unique $(gTARGET_BASENAME($(gTARGET_SUBVARIANT($(>))))) ] ;
depend-on-libraries $(targets) : $(dlls-and-import-libs) ;
depend-on-libs $(targets) : $(dlls-and-import-libs) ;
}
# Given build properties, returns the normalised version of the <tag> features for
@@ -1733,8 +1743,7 @@ rule generate-dependencies ( main-target : subvariant-targets + )
= [ link-libraries $(lib-main-targets)
: $(gCURRENT_TOOLSET) $(variant) : $(p)
] ;
local r = depend-on-$(t) ;
$(r) $(subvariant-targets) : $(lib-targets) ;
depend-on-$(t) $(subvariant-targets) : $(lib-targets) ;
}
}
}

2
v1/python.jam
View File

@@ -335,7 +335,7 @@ rule Link-PYD
Aix-Implib-Action $(<) : $(>) ;
}
}
Link-action $(<) : $(>) : PYD ;
.do-link $(<) : $(>) : PYD ;
}
declare-target-type PYD : <shared-linkable>true ;