Ticket #7253: BoostBuild-AsmRsp.patch

File BoostBuild-AsmRsp.patch, 1.5 KB (added by Pekka Seppänen <pekka.seppanen@…>, 10 years ago)

Add a proper command line escaping to assembler build rules.

  • msvc.jam

     
    311311#   -Cp    preserve case of user identifiers
    312312#   -Cx    preserve case in publics, externs
    313313#
    314 actions compile.asm
     314rule compile.asm ( targets + : sources * : properties * )
    315315{
    316     $(.ASM) -c -Zp4 -Cp -Cx -D$(DEFINES) $(ASMFLAGS) $(USER_ASMFLAGS) -Fo "$(<:W)" "$(>:W)"
     316    get-rspline $(targets) : "-Zp4 -Cp -Cx" ;
     317    compile-asm $(targets) : $(sources) ;
    317318}
    318319
     320actions compile-asm
     321{
     322    $(.ASM) @"@($(<[1]:W).rsp:E=$(ASM_RSPLINE) -Fo"$(<[1]:W)" $(>[1]:W)")"
     323}
    319324
     325
    320326rule compile.c ( targets + : sources * : properties * )
    321327{
    322328    C++FLAGS on $(targets[1]) = ;
     
    10541060    CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS)
    10551061        $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(.nl)-D$(DEFINES)
    10561062        $(.nl)\"-I$(INCLUDES:W)\" ] ;
     1063
     1064    ASM_RSPLINE on $(target) = [ on $(target) return $(lang-opt)
     1065       $(ASMFLAGS) $(USER_ASMFLAGS) -c $(.nl)-D$(DEFINES) ] ;       
    10571066}
    10581067
    10591068class msvc-linking-generator : linking-generator
     
    12391248    toolset.flags msvc.compile.asm ASMFLAGS <warnings>all : /W4 ;
    12401249    toolset.flags msvc.compile.asm ASMFLAGS <warnings-as-errors>on : /WX ;
    12411250
    1242     toolset.flags msvc.compile.asm DEFINES <define> ;
    1243 
    12441251    # Declare flags for linking.
    12451252    {
    12461253        toolset.flags msvc.link PDB_LINKFLAG <debug-symbols>on/<debug-store>database : /PDB: ;  # not used yet