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

Resolve confict between builtin.lib-generator and $(toolset).prebuilt

Browse Source 
in favour of the latter (toolset.prebuilt). This cuts down the number
of generator invocations for prebuilt target and is more clear.

Thanks to Mark Evans for pointing this out.


[SVN r32952]
This commit is contained in:
Vladimir Prus
2006-02-16 07:47:09 +00:00
parent 776f6adfbf
commit d2f9daebca
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2/tools/builtin.jam
View File

@@ -551,7 +551,7 @@ class prebuilt-lib-generator : generator
generators.register
[ new prebuilt-lib-generator builtin.prebuilt : : LIB : <file> ] ;
generators.override builtin.lib-generator : builtin.prebuilt ;
generators.override builtin.prebuilt : builtin.lib-generator ;
class compile-action : action

2
v2/tools/como-linux.jam
View File

@@ -20,7 +20,7 @@ feature.extend-subfeature toolset como : platform : linux ;
toolset.inherit-generators como-linux
<toolset>como <toolset-como:platform>linux : unix ;
generators.override builtin.lib-generator : como-linux.prebuilt ;
generators.override como-linux.prebuilt : builtin.lib-generator ;
generators.override como-linux.searched-lib-generator : searched-lib-generator ;
toolset.inherit-flags como-linux : unix ;
toolset.inherit-rules como-linux : gcc ;

2
v2/tools/darwin.jam
View File

@@ -16,7 +16,7 @@ import generators ;
toolset.register darwin ;
import gcc ;
toolset.inherit-generators darwin : gcc ;
generators.override builtin.lib-generator : darwin.prebuilt ;
generators.override darwin.prebuilt : builtin.lib-generator ;
generators.override darwin.searched-lib-generator : searched-lib-generator ;
toolset.inherit-rules darwin : gcc ;
toolset.inherit-flags darwin : gcc ;

2
v2/tools/gcc.jam
View File

@@ -21,7 +21,7 @@ feature.extend toolset : gcc ;
import unix ;
toolset.inherit-generators gcc : unix : unix.link unix.link.dll ;
generators.override builtin.lib-generator : gcc.prebuilt ;
generators.override gcc.prebuilt : builtin.lib-generator ;
toolset.inherit-flags gcc : unix ;
toolset.inherit-rules gcc : unix ;

2
v2/tools/intel-linux.jam
View File

@@ -18,7 +18,7 @@ feature.extend-subfeature toolset intel : platform : linux ;
toolset.inherit-generators intel-linux
<toolset>intel <toolset-intel:platform>linux : gcc ;
generators.override builtin.lib-generator : intel-linux.prebuilt ;
generators.override intel-linux.prebuilt : builtin.lib-generator ;
generators.override intel-linux.prebuilt : builtin.prebuilt ;
generators.override intel-linux.searched-lib-generator : searched-lib-generator ;

2
v2/tools/sun.jam
View File

@@ -14,7 +14,7 @@ import common ;
feature.extend toolset : sun ;
toolset.inherit sun : unix ;
generators.override builtin.lib-generator : sun.prebuilt ;
generators.override sun.prebuilt : builtin.lib-generator ;
generators.override sun.searched-lib-generator : searched-lib-generator ;
feature.subfeature toolset sun : version ;

2
v2/tools/unix.jam
View File

@@ -138,7 +138,7 @@ generators.register
[ new unix-prebuilt-lib-generator unix.prebuilt : : LIB
: <file> <toolset>unix ] ;
generators.override builtin.lib-generator : unix.prebuilt ;
generators.override unix.prebuilt : builtin.lib-generator ;
# Declare generators

2
v2/tools/vacpp.jam
View File

@@ -15,7 +15,7 @@ import generators ;
feature.extend toolset : vacpp ;
toolset.inherit vacpp : unix ;
generators.override builtin.lib-generator : vacpp.prebuilt ;
generators.override vacpp.prebuilt : builtin.lib-generator ;
generators.override vacpp.searched-lib-generator : searched-lib-generator ;
feature.subfeature toolset vacpp : version ;