Skip to content

Commit

Permalink
fix broken multiple configurations for some toolset modules (#388)
Browse files Browse the repository at this point in the history
  • Loading branch information
grisumbras committed May 9, 2024
1 parent bed068a commit b159938
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/tools/fop.jam
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rule init ( fop-command ? : java-home ? : java ? )
}
else
{
if ! ( $(1) && $(2) && $(3) )
if ! ( $(1) || $(2) || $(3) )
{
return ;
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/pkg-config.jam
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ rule init ( config ? : command * : options * )
{
config = [ default-config ] ;
if ( $(config) in [ $(.configs).all ] )
&& ! ( $(command) && $(options) )
&& ! ( $(command) || $(options) )
{
return ;
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/python.jam
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
}
else
{
if ! ( $(1) && $(2) && $(3) && $(4) && $(5) && $(6) )
if ! ( $(1) || $(2) || $(3) || $(4) || $(5) || $(6) )
{
return ;
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/saxonhe.jam
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rule init ( saxonhe_jar ? : java_exe ? )
}
else
{
if ! ( $(1) && $(2) )
if ! ( $(1) || $(2) )
{
return ;
}
Expand Down

0 comments on commit b159938

Please sign in to comment.