Subject: [Boost-commit] svn:boost r83750 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2013-04-03 14:02:34
Author: steven_watanabe
Date: 2013-04-03 14:02:33 EDT (Wed, 03 Apr 2013)
New Revision: 83750
URL: http://svn.boost.org/trac/boost/changeset/83750
Log:
Fix passing the condition.
Text files modified:
trunk/tools/build/v2/tools/zlib.jam | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
Modified: trunk/tools/build/v2/tools/zlib.jam
==============================================================================
--- trunk/tools/build/v2/tools/zlib.jam (original)
+++ trunk/tools/build/v2/tools/zlib.jam 2013-04-03 14:02:33 EDT (Wed, 03 Apr 2013)
@@ -122,6 +122,8 @@
local build-name = [ property.select <build-name> : $(options) ] ;
build-name = $(build-name:G=) ;
+ condition = [ targets.main-target-requirements $(condition) : $(.project) ] ;
+
local no-build-from-source ;
# Ignore environmental ZLIB_SOURCE if this initialization
# requested to search for a specific pre-built library.
@@ -141,7 +143,7 @@
source-path ?= [ modules.peek : ZLIB_SOURCE ] ;
- if $(.configured.$(condition:J=-))
+ if $(.configured.$(condition))
{
if $(is-default)
{
@@ -158,7 +160,7 @@
}
else if $(source-path) && ! $(no-build-from-source)
{
- library-name ?= z ;
+ build-name ?= z ;
library-id = [ CALC $(library-id) + 1 ] ;
tag = [ MATCH ^@?(.*)$ : $(tag) ] ;
if $(tag) && ! [ MATCH ^([^%]*)%([^%]+)$ : $(tag) ]
@@ -187,15 +189,14 @@
target = [ targets.create-typed-target LIB : $(.project)
: $(build-name).$(library-id)
: $(sources)
- : $(condition)
- <tag>@$(tag)
+ : <tag>@$(tag)
<include>$(source-path)
<toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
<toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
<link>shared:<define>ZLIB_DLL
:
: <include>$(source-path) ] ;
- }
+ }
local mt = [ new ac-library zlib : $(.project) : $(condition) ] ;
$(mt).set-header $(header) ;
@@ -221,5 +222,5 @@
$(mt).set-default-names $(names) ;
targets.main-target-alternative $(mt) ;
}
- .configured.$(condition:J=-) = true ;
+ .configured.$(condition) = true ;
}