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

[merge from head] Fix RC tool to fallback to the null rc type when a real one can't be found.

Browse Source 
[SVN r33700]
This commit is contained in:
Rene Rivera
2006-04-14 20:12:11 +00:00
parent 14993206c0
commit 6fdf3148af
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tools/gcc.jam
View File

@@ -105,7 +105,7 @@ rule init ( version ? : command * : options * )
#~ - The archive builder.
local archiver =
[ common.get-invocation-command gcc
: ar : [ feature.get-values <archiver> : $(options) ] : $(bin) : PATH ] ;
: ar : [ feature.get-values <archiver> : $(options) ] : $(bin) : search-path ] ;
flags gcc.archive .AR $(condition) : $(archiver[1]) ;
if $(.debug-configuration)
{
@@ -115,10 +115,21 @@ rule init ( version ? : command * : options * )
#~ - The resource compiler.
local rc =
[ common.get-invocation-command gcc
: windres : [ feature.get-values <rc> : $(options) ] : $(bin) : PATH ] ;
: windres : [ feature.get-values <rc> : $(options) ] : $(bin) : search-path ] ;
local rc-type =
[ feature.get-values <rc-type> : $(options) ] ;
rc-type ?= windres ;
if ! $(rc)
{
#~ If we can't find an RC compiler we fallback to a null RC compiler
#~ that creates empty object files. This allows the same Jamfiles
#~ to work across the board. The null RC uses the assembler to create
#~ the empty objects, so configure that.
local rc =
[ common.get-invocation-command gcc
: as : : $(bin) : search-path ] ;
rc-type = null ;
}
rc.configure $(rc) : $(condition) : <rc-type>$(rc-type) ;
}