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

Merge pull request #154 from fwyzard/fix-library-link-check

Browse Source 
Do not reuse the same target for different library link checks
This commit is contained in:
Edward Diener
2017-01-16 21:07:30 -05:00
committed by GitHub
parent 134ebafaf5 373fb6f769
commit c7e77498fc
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/build/ac.jam
View File

@@ -76,14 +76,6 @@ rule construct-library ( name : property-set : provided-path ? )
rule find-library ( properties : names + : provided-path ? )
{
local result ;
if ! $(.main.cpp)
{
local a = [ class.new action : ac.generate-main :
[ property-set.empty ] ] ;
.main.cpp = [ virtual-target.register
[ class.new file-target main.cpp exact
: CPP : $(.project) : $(a) ] ] ;
}
if [ $(properties).get <link> ] = shared
{
link-opts = <link>shared <link>static ;
@@ -100,8 +92,12 @@ rule find-library ( properties : names + : provided-path ? )
{
local name = $(names-iter[1]) ;
local lib = [ construct-library $(name) : $(properties) : $(provided-path) ] ;
local a = [ class.new action : ac.generate-main :
[ property-set.empty ] ] ;
local main.cpp = [ virtual-target.register
[ class.new file-target main-$(name).cpp exact : CPP : $(.project) : $(a) ] ] ;
local test = [ generators.construct $(.project) $(name) : EXE
: [ $(properties).add $(lib[1]) ] : $(.main.cpp) $(lib[2-])
: [ $(properties).add $(lib[1]) ] : $(main.cpp) $(lib[2-])
: true ] ;
local jam-targets ;
for t in $(test[2-])