Skip to content

Commit

Permalink
Add missing calls to common.make-command-string to properly handle qu…
Browse files Browse the repository at this point in the history
…oting spaces in toolset commands.
  • Loading branch information
grafikrobot committed Nov 13, 2024
1 parent 937a9f3 commit 22d5f85
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/tools/clang-vxworks.jam
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rule init ( version ? : command * : options * )
linker = [ get-values <linker> : $(options) ] ;

# Determine the version
local command-string = $(command:J=" ") ;
local command-string = [ common.make-command-string $(command) ] ;
if $(command)
{
version ?= [ MATCH "^([0-9.]+)"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/darwin.jam
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ rule init ( version ? : command * : options * : requirement * )
{
# - The 'command' variable can have multiple elements. When calling
# the SHELL builtin we need a single string.
local command-string = $(command:J=" ") ;
local command-string = [ common.make-command-string $(command) ] ;
real-version = [ MATCH "^([0-9.]+)"
: [ SHELL "$(command-string) -dumpversion" ] ] ;
version ?= $(real-version) ;
Expand Down
3 changes: 1 addition & 2 deletions src/tools/embarcadero.jam
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,7 @@ rule init ( version ? : command * : options * )
{
# Determine the version
if $(command) {
local command-string = "$(command)" ;
command-string = $(command-string:J=" ") ;
local command-string = [ common.make-command-string $(command) ] ;
local soutput = [ SHELL "$(command-string) --version" ] ;
version ?= [ MATCH "Embarcadero C[+][+] ([0-9.]+)" : $(soutput) ] ;
cl_version = [ MATCH ".+version[ ]+([0-9.]+)" : $(soutput) ] ;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/pathscale.jam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ rule init ( version ? : command * : options * )
: /opt/ekopath/bin ] ;

# Determine the version
local command-string = $(command:J=" ") ;
local command-string = [ common.make-command-string $(command) ] ;
if $(command)
{
version ?= [ MATCH "^([0-9.]+)"
Expand Down

0 comments on commit 22d5f85

Please sign in to comment.