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

clang-win.jam: allow options (such as -fuse-ld=lld, -flto=thin) in command

Browse Source
This commit is contained in:
Peter Dimov
2018-11-05 18:45:01 +02:00
parent 6910438c88
commit 5dba250502
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/clang-win.jam
View File

@@ -71,12 +71,12 @@ rule init ( version ? : command * : options * )
errors.error "Cannot configure toolset clang-win: no 'clang-cl.exe' command found or given" ;
}
local compiler = [ path.native $(command) ] ;
compiler = "\"$(compiler)\"" ;
local compiler = "\"$(command)\"" ;
compiler = "$(compiler:J= )" ;
version ?= [ MATCH "version ([0-9.]+)" : [ SHELL "$(compiler) --version" ] ] ;
.notice "configuring '$(command)' version '$(version)'" ;
.notice "using compiler '$(compiler)', version '$(version)'" ;
local condition = [ common.check-init-parameters clang-win : version $(version) ] ;
@@ -103,6 +103,11 @@ rule init ( version ? : command * : options * )
local ml = [ regex.replace $(items[1]) "x64\\\\+link\\.exe" "x64\\ml64.exe" ] ;
ml = [ regex.replace $(ml) "x86\\\\+link\\.exe" "x86\\ml.exe" ] ;
if ! [ MATCH "(ml\\.exe)" "(ml64\\.exe)" : $(ml) ]
{
ml = ;
}
local assembler = [ get-option "assembler" : $(addr) : $(options) ] ;
assembler ?= $(ml) ;
if $(addr) = 32 { assembler ?= ml.exe ; } else { assembler ?= ml64.exe ; }