VirtualBox

Changeset 3325 in kBuild


Ignore:
Timestamp:
Apr 17, 2020 2:02:23 AM (5 years ago)
Author:
bird
Message:

tools/VCC141*.kmk: More work on the Visual C++ 14.1 tools.

Location:
trunk/kBuild/tools
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC141.kmk

    r3323 r3325  
    141141#
    142142TOOL_VCC141_COBJSUFF         ?= .obj
    143 TOOL_VCC141_CFLAGS           ?= -TC -nologo -Zi
     143TOOL_VCC141_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
    144144TOOL_VCC141_CFLAGS.debug     ?=
    145145TOOL_VCC141_CFLAGS.dbgopt    ?= -O2
    … …  
    150150
    151151TOOL_VCC141_CXXOBJSUFF       ?= .obj
    152 TOOL_VCC141_CXXFLAGS         ?= -TP -nologo -Zi
     152TOOL_VCC141_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
    153153TOOL_VCC141_CXXFLAGS.debug   ?=
    154154TOOL_VCC141_CXXFLAGS.dbgopt  ?= -O2

  • trunk/kBuild/tools/VCC141AMD64.kmk

    r3323 r3325  
    103103#
    104104TOOL_VCC141AMD64_COBJSUFF         ?= .obj
    105 TOOL_VCC141AMD64_CFLAGS           ?= -TC -nologo -Zi
     105TOOL_VCC141AMD64_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
    106106TOOL_VCC141AMD64_CFLAGS.debug     ?=
    107107TOOL_VCC141AMD64_CFLAGS.dbgopt    ?= -O2
    … …  
    112112
    113113TOOL_VCC141AMD64_CXXOBJSUFF       ?= .obj
    114 TOOL_VCC141AMD64_CXXFLAGS         ?= -TP -nologo -Zi
     114TOOL_VCC141AMD64_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
    115115TOOL_VCC141AMD64_CXXFLAGS.debug   ?=
    116116TOOL_VCC141AMD64_CXXFLAGS.dbgopt  ?= -O2

  • trunk/kBuild/tools/VCC141X86.kmk

    r3323 r3325  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting AMD64.
     3# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting x86.
    44#
    55
    … …  
    3636endif
    3737
    38 TOOL_VCC141AMD64 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting AMD64
     38TOOL_VCC141X86 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting x86
    3939
    4040#
    4141# Tool Specific Properties
    4242#
    43 ifndef PATH_TOOL_VCC141AMD64
    44  PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141)
     43ifndef PATH_TOOL_VCC141X86
     44 PATH_TOOL_VCC141X86 := $(PATH_TOOL_VCC141)
    4545else
    4646 # Resolve any fancy stuff once and for all.
    47  PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141AMD64)
    48 endif
    49 
    50 ifndef PATH_TOOL_VCC141AMD64_BIN
    51 PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_HOST_BIN)/x64
     47 PATH_TOOL_VCC141X86 := $(PATH_TOOL_VCC141X86)
     48endif
     49
     50ifndef PATH_TOOL_VCC141X86_BIN
     51PATH_TOOL_VCC141X86_BIN     := $(PATH_TOOL_VCC141_HOST_BIN)/x86
    5252else
    53 PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_BIN)
    54 endif
    55 PATH_TOOL_VCC141AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141AMD64_BIN))
    56 
    57 ifndef PATH_TOOL_VCC141AMD64_LIB
    58 PATH_TOOL_VCC141AMD64_LIB     := $(PATH_TOOL_VCC141_LIB.amd64)
     53PATH_TOOL_VCC141X86_BIN     := $(PATH_TOOL_VCC141_BIN)
     54endif
     55PATH_TOOL_VCC141X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141X86_BIN))
     56
     57ifndef PATH_TOOL_VCC141X86_LIB
     58PATH_TOOL_VCC141X86_LIB     := $(PATH_TOOL_VCC141_LIB.x86)
    5959endif
    6060ifndef PATH_TOOL_VCC141_ONECORE_LIB
    61 PATH_TOOL_VCC141_ONECORE_LIB  := $(PATH_TOOL_VCC141_ONECORE_LIB.amd64)
    62 endif
    63 
    64 ifndef PATH_TOOL_VCC141AMD64_INC
    65 PATH_TOOL_VCC141AMD64_INC     := $(PATH_TOOL_VCC141_INC)
    66 endif
    67 
    68 ifndef PATH_TOOL_VCC141AMD64_ATLMFC_INC
    69 PATH_TOOL_VCC141AMD64_ATLMFC_INC := $(PATH_TOOL_VCC141_ATLMFC_INC.amd64)
    70 endif
    71 ifndef PATH_TOOL_VCC141AMD64_ATLMFC_LIB
    72 PATH_TOOL_VCC141AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC141_ATLMFC_LIB.amd64)
    73 endif
    74 
    75 TOOL_VCC141AMD64_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
    76 TOOL_VCC141AMD64_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
    77 TOOL_VCC141AMD64_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/ml64.exe
    78 #TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below
    79 TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe /LIB
    80 TOOL_VCC141AMD64_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe
    81 TOOL_VCC141AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/dumpbin.exe
    82 TOOL_VCC141AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/editbin.exe
    83 
    84 TOOL_VCC141AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
    85 TOOL_VCC141AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
    86 
    87 undefine TOOL_VCC141AMD64_USE_KSUBMIT # for now
    88 ifdef TOOL_VCC141AMD64_USE_KSUBMIT
     61PATH_TOOL_VCC141_ONECORE_LIB  := $(PATH_TOOL_VCC141_ONECORE_LIB.x86)
     62endif
     63
     64ifndef PATH_TOOL_VCC141X86_INC
     65PATH_TOOL_VCC141X86_INC     := $(PATH_TOOL_VCC141_INC)
     66endif
     67
     68ifndef PATH_TOOL_VCC141X86_ATLMFC_INC
     69PATH_TOOL_VCC141X86_ATLMFC_INC := $(PATH_TOOL_VCC141_ATLMFC_INC.x86)
     70endif
     71ifndef PATH_TOOL_VCC141X86_ATLMFC_LIB
     72PATH_TOOL_VCC141X86_ATLMFC_LIB := $(PATH_TOOL_VCC141_ATLMFC_LIB.x86)
     73endif
     74
     75TOOL_VCC141X86_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/cl.exe
     76TOOL_VCC141X86_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/cl.exe
     77TOOL_VCC141X86_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/ml64.exe
     78#TOOL_VCC141X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/lib.exe - just an exec wrapper for the below
     79TOOL_VCC141X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/link.exe /LIB
     80TOOL_VCC141X86_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/link.exe
     81TOOL_VCC141X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/dumpbin.exe
     82TOOL_VCC141X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/editbin.exe
     83
     84TOOL_VCC141X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
     85TOOL_VCC141X86_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
     86
     87undefine TOOL_VCC141X86_USE_KSUBMIT # for now
     88ifdef TOOL_VCC141X86_USE_KSUBMIT
    8989 ifeq ($(KBUILD_HOST),win)
    90   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141AMD64_BIN)),-3),64/)
    91    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    92    TOOL_VCC141AMD64_KSUBMIT_DD = $(TOOL_VCC141AMD64_KSUBMIT) --
     90  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141X86_BIN)),-3),64/)
     91   TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
     92   TOOL_VCC141X86_KSUBMIT_DD = $(TOOL_VCC141X86_KSUBMIT) --
    9393  else
    94    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    95    TOOL_VCC141AMD64_KSUBMIT_DD = $(TOOL_VCC141AMD64_KSUBMIT) --
     94   TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     95   TOOL_VCC141X86_KSUBMIT_DD = $(TOOL_VCC141X86_KSUBMIT) --
    9696  endif
    9797 endif
    … …  
    102102# Properties used by kBuild
    103103#
    104 TOOL_VCC141AMD64_COBJSUFF         ?= .obj
    105 TOOL_VCC141AMD64_CFLAGS           ?= -TC -nologo -Zi
    106 TOOL_VCC141AMD64_CFLAGS.debug     ?=
    107 TOOL_VCC141AMD64_CFLAGS.dbgopt    ?= -O2
    108 TOOL_VCC141AMD64_CFLAGS.release   ?= -O2
    109 TOOL_VCC141AMD64_CFLAGS.profile   ?= -O2
    110 TOOL_VCC141AMD64_CINCS            ?= $(PATH_TOOL_VCC141AMD64_INC)
    111 TOOL_VCC141AMD64_CDEFS            ?=
    112 
    113 TOOL_VCC141AMD64_CXXOBJSUFF       ?= .obj
    114 TOOL_VCC141AMD64_CXXFLAGS         ?= -TP -nologo -Zi
    115 TOOL_VCC141AMD64_CXXFLAGS.debug   ?=
    116 TOOL_VCC141AMD64_CXXFLAGS.dbgopt  ?= -O2
    117 TOOL_VCC141AMD64_CXXFLAGS.release ?= -O2
    118 TOOL_VCC141AMD64_CXXFLAGS.profile ?= -O2
    119 TOOL_VCC141AMD64_CXXINCS          ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
    120 TOOL_VCC141AMD64_CXXDEFS          ?=
    121 
    122 TOOL_VCC141AMD64_ASOBJSUFF        ?= .obj
    123 
    124 TOOL_VCC141AMD64_RCOBJSUFF        ?= .res
    125 TOOL_VCC141AMD64_RCINCS           ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
    126 
    127 TOOL_VCC141AMD64_ARFLAGS          ?= -nologo -machine:amd64
    128 TOOL_VCC141AMD64_ARLIBSUFF        ?= .lib
    129 
    130 TOOL_VCC141AMD64_LDFLAGS          ?= -nologo -machine:amd64
    131 TOOL_VCC141AMD64_LDFLAGS.debug    ?= -debug
    132 TOOL_VCC141AMD64_LDFLAGS.dbgopt   ?= -debug
    133 TOOL_VCC141AMD64_LDFLAGS.profile  ?= -debug
    134 TOOL_VCC141AMD64_LDFLAGS.release  ?=
     104TOOL_VCC141X86_COBJSUFF         ?= .obj
     105TOOL_VCC141X86_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
     106TOOL_VCC141X86_CFLAGS.debug     ?=
     107TOOL_VCC141X86_CFLAGS.dbgopt    ?= -O2
     108TOOL_VCC141X86_CFLAGS.release   ?= -O2
     109TOOL_VCC141X86_CFLAGS.profile   ?= -O2
     110TOOL_VCC141X86_CINCS            ?= $(PATH_TOOL_VCC141X86_INC)
     111TOOL_VCC141X86_CDEFS            ?=
     112
     113TOOL_VCC141X86_CXXOBJSUFF       ?= .obj
     114TOOL_VCC141X86_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
     115TOOL_VCC141X86_CXXFLAGS.debug   ?=
     116TOOL_VCC141X86_CXXFLAGS.dbgopt  ?= -O2
     117TOOL_VCC141X86_CXXFLAGS.release ?= -O2
     118TOOL_VCC141X86_CXXFLAGS.profile ?= -O2
     119TOOL_VCC141X86_CXXINCS          ?= $(PATH_TOOL_VCC141X86_INC) $(PATH_TOOL_VCC141X86_ATLMFC_INC)
     120TOOL_VCC141X86_CXXDEFS          ?=
     121
     122TOOL_VCC141X86_ASOBJSUFF        ?= .obj
     123
     124TOOL_VCC141X86_RCOBJSUFF        ?= .res
     125TOOL_VCC141X86_RCINCS           ?= $(PATH_TOOL_VCC141X86_INC) $(PATH_TOOL_VCC141X86_ATLMFC_INC)
     126
     127TOOL_VCC141X86_ARFLAGS          ?= -nologo -machine:x86
     128TOOL_VCC141X86_ARLIBSUFF        ?= .lib
     129
     130TOOL_VCC141X86_LDFLAGS          ?= -nologo -machine:x86
     131TOOL_VCC141X86_LDFLAGS.debug    ?= -debug
     132TOOL_VCC141X86_LDFLAGS.dbgopt   ?= -debug
     133TOOL_VCC141X86_LDFLAGS.profile  ?= -debug
     134TOOL_VCC141X86_LDFLAGS.release  ?=
    135135
    136136
    … …  
    149149# @param    $(outbase)  Output basename (full). Use this for list files and such.
    150150# @param    $(objsuff)  Object suffix.
    151 TOOL_VCC141AMD64_COMPILE_C_DEPEND =
    152 TOOL_VCC141AMD64_COMPILE_C_DEPORD =
    153 TOOL_VCC141AMD64_COMPILE_C_OUTPUT =
    154 TOOL_VCC141AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
    155 ifdef TOOL_VCC141AMD64_KSUBMIT
    156  TOOL_VCC141AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
    157  define TOOL_VCC141AMD64_COMPILE_C_CMDS
    158         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    159                 -- $(TOOL_VCC141AMD64_CC) -c\
     151TOOL_VCC141X86_COMPILE_C_DEPEND =
     152TOOL_VCC141X86_COMPILE_C_DEPORD =
     153TOOL_VCC141X86_COMPILE_C_OUTPUT =
     154TOOL_VCC141X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
     155ifdef TOOL_VCC141X86_KSUBMIT
     156 TOOL_VCC141X86_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
     157 define TOOL_VCC141X86_COMPILE_C_CMDS
     158        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     159                -- $(TOOL_VCC141X86_CC) -c\
    160160                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    161161                -Fd$(outbase)-obj.pdb \
    … …  
    164164 endef
    165165else
    166  define TOOL_VCC141AMD64_COMPILE_C_CMDS
    167         $(QUIET)$(TOOL_VCC141AMD64_CC) -c\
     166 define TOOL_VCC141X86_COMPILE_C_CMDS
     167        $(QUIET)$(TOOL_VCC141X86_CC) -c\
    168168                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    169169                -Fd$(outbase)-obj.pdb \
    … …  
    172172        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    173173 endef
    174 endif # !TOOL_VCC141AMD64_KSUBMIT
     174endif # !TOOL_VCC141X86_KSUBMIT
    175175
    176176
    … …  
    188188# @param    $(outbase)  Output basename (full). Use this for list files and such.
    189189# @param    $(objsuff)  Object suffix.
    190 TOOL_VCC141AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    191 TOOL_VCC141AMD64_COMPILE_CXX_DEPORD =
    192 TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT =
    193 TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
     190TOOL_VCC141X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
     191TOOL_VCC141X86_COMPILE_CXX_DEPORD =
     192TOOL_VCC141X86_COMPILE_CXX_OUTPUT =
     193TOOL_VCC141X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
    194194        ,,$(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb))
    195 ifdef TOOL_VCC141AMD64_KSUBMIT
    196  TOOL_VCC141AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
    197  define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
    198         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    199                 -- $(TOOL_VCC141AMD64_CXX) -c\
     195ifdef TOOL_VCC141X86_KSUBMIT
     196 TOOL_VCC141X86_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
     197 define TOOL_VCC141X86_COMPILE_CXX_CMDS
     198        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     199                -- $(TOOL_VCC141X86_CXX) -c\
    200200                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    201201                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    206206 endef
    207207else
    208  define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
    209         $(QUIET)$(TOOL_VCC141AMD64_CXX) -c\
     208 define TOOL_VCC141X86_COMPILE_CXX_CMDS
     209        $(QUIET)$(TOOL_VCC141X86_CXX) -c\
    210210                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    211211                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    216216        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    217217 endef
    218 endif # !TOOL_VCC141AMD64_KSUBMIT
     218endif # !TOOL_VCC141X86_KSUBMIT
    219219
    220220
    … …  
    225225# related _1_VCC_PCH_FILE and add -Yc.
    226226#
    227 TOOL_VCC141AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
    228 TOOL_VCC141AMD64-PCH_EXTENDS                 := VCC141AMD64
    229 TOOL_VCC141AMD64-PCH_CXXOBJSUFF              := .obj
    230 TOOL_VCC141AMD64-PCH_CXXINCS                  = $(TOOL_VCC141AMD64_CXXINCS)
    231 TOOL_VCC141AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC141AMD64_CXXFLAGS) -FS
    232 TOOL_VCC141AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC141AMD64_CXXFLAGS.debug)
    233 TOOL_VCC141AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141AMD64_CXXFLAGS.dbgopt)
    234 TOOL_VCC141AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC141AMD64_CXXFLAGS.release)
    235 TOOL_VCC141AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC141AMD64_CXXFLAGS.profile)
    236 TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
    237 TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
    238 TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    239 TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
    240 ifdef TOOL_VCC141AMD64_KSUBMIT
    241  define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
     227TOOL_VCC141X86-PCH                         := Helper for creating precompiled header using CXX handling.
     228TOOL_VCC141X86-PCH_EXTENDS                 := VCC141X86
     229TOOL_VCC141X86-PCH_CXXOBJSUFF              := .obj
     230TOOL_VCC141X86-PCH_CXXINCS                  = $(TOOL_VCC141X86_CXXINCS)
     231TOOL_VCC141X86-PCH_CXXFLAGS                 = $(TOOL_VCC141X86_CXXFLAGS) -FS
     232TOOL_VCC141X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC141X86_CXXFLAGS.debug)
     233TOOL_VCC141X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141X86_CXXFLAGS.dbgopt)
     234TOOL_VCC141X86-PCH_CXXFLAGS.release         = $(TOOL_VCC141X86_CXXFLAGS.release)
     235TOOL_VCC141X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC141X86_CXXFLAGS.profile)
     236TOOL_VCC141X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
     237TOOL_VCC141X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
     238TOOL_VCC141X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
     239TOOL_VCC141X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
     240ifdef TOOL_VCC141X86_KSUBMIT
     241 define TOOL_VCC141X86-PCH_COMPILE_CXX_CMDS
    242242        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    243         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    244                 -- $(TOOL_VCC141AMD64_CXX) -c -Yc\
     243        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
     244                -- $(TOOL_VCC141X86_CXX) -c -Yc\
    245245                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    246246               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    251251 endef
    252252else
    253  define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
     253 define TOOL_VCC141X86-PCH_COMPILE_CXX_CMDS
    254254        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    255         $(QUIET)$(TOOL_VCC141AMD64_CXX) -c -Yc\
     255        $(QUIET)$(TOOL_VCC141X86_CXX) -c -Yc\
    256256                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    257257               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    263263
    264264 endef
    265 endif # !TOOL_VCC141AMD64_KSUBMIT
     265endif # !TOOL_VCC141X86_KSUBMIT
    266266
    267267
    … …  
    281281# @param    $(outbase)  Output basename (full). Use this for list files and such.
    282282# @param    $(objsuff)  Object suffix.
    283 TOOL_VCC141AMD64_COMPILE_RC_DEPEND =
    284 TOOL_VCC141AMD64_COMPILE_RC_DEPORD =
    285 TOOL_VCC141AMD64_COMPILE_RC_OUTPUT =
    286 define TOOL_VCC141AMD64_COMPILE_RC_CMDS
    287         $(QUIET)$(TOOL_VCC141AMD64_RC) \
     283TOOL_VCC141X86_COMPILE_RC_DEPEND =
     284TOOL_VCC141X86_COMPILE_RC_DEPORD =
     285TOOL_VCC141X86_COMPILE_RC_OUTPUT =
     286define TOOL_VCC141X86_COMPILE_RC_CMDS
     287        $(QUIET)$(TOOL_VCC141X86_RC) \
    288288                $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\
    289289                /fo$(obj)\
    … …  
    302302# @param    $(outbase)  Output basename (full). Use this for list files and such.
    303303#
    304 TOOL_VCC141AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
    305 TOOL_VCC141AMD64_LINK_LIBRARY_DEPORD =
    306 TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    307 TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    308 define TOOL_VCC141AMD64_LINK_LIBRARY_CMDS
     304TOOL_VCC141X86_LINK_LIBRARY_DEPEND = $(othersrc)
     305TOOL_VCC141X86_LINK_LIBRARY_DEPORD =
     306TOOL_VCC141X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     307TOOL_VCC141X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     308define TOOL_VCC141X86_LINK_LIBRARY_CMDS
    309309        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    310310                $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \
    311311                $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))"))
    312         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     312        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    313313endef
    314314
    … …  
    328328# @param    $(outbase)      Output basename (full). Use this for list files and such.
    329329#
    330 TOOL_VCC141AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    331 TOOL_VCC141AMD64_LINK_PROGRAM_DEPORD =
    332 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
    333 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    334 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
    335 TOOL_VCC141AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    336 define TOOL_VCC141AMD64_LINK_PROGRAM_CMDS
     330TOOL_VCC141X86_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     331TOOL_VCC141X86_LINK_PROGRAM_DEPORD =
     332TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
     333TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     334TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
     335TOOL_VCC141X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     336define TOOL_VCC141X86_LINK_PROGRAM_CMDS
    337337        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    338338                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    339         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     339        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
    340340                /OUT:$(out) \
    341341                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    345345                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    346346                @$(outbase).rsp
    347 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     347ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
    348348        $(QUIET)$(TEST) -f $(out).manifest -- \
    349                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     349                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    350350endif
    351351endef
    … …  
    366366#
    367367# @param    $(outbase)  Output basename (full). Use this for list files and such.
    368 TOOL_VCC141AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    369 TOOL_VCC141AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    370 TOOL_VCC141AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
    371 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    372 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
    373 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
    374 TOOL_VCC141AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    375 define TOOL_VCC141AMD64_LINK_DLL_CMDS
     368TOOL_VCC141X86_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     369TOOL_VCC141X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
     370TOOL_VCC141X86_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
     371TOOL_VCC141X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
     372TOOL_VCC141X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
     373TOOL_VCC141X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
     374TOOL_VCC141X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     375define TOOL_VCC141X86_LINK_DLL_CMDS
    376376        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    377377                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    378         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     378        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
    379379                /OUT:$(out) \
    380380                /IMPLIB:$(outbase).lib \
    … …  
    386386                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    387387                @$(outbase).rsp
    388 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     388ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
    389389        $(QUIET)$(TEST) -f $(out).manifest -- \
    390                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     390                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    391391endif
    392392        $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
    … …  
    410410#
    411411# @param    $(outbase)  Output basename (full). Use this for list files and such.
    412 TOOL_VCC141AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    413 TOOL_VCC141AMD64_LINK_SYSMOD_DEPORD =
    414 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    415 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
    416 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
    417 TOOL_VCC141AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    418 define TOOL_VCC141AMD64_LINK_SYSMOD_CMDS
     412TOOL_VCC141X86_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     413TOOL_VCC141X86_LINK_SYSMOD_DEPORD =
     414TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     415TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
     416TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
     417TOOL_VCC141X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     418define TOOL_VCC141X86_LINK_SYSMOD_CMDS
    419419        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    420420                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    421         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     421        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
    422422                /OUT:$(out) \
    423423                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    427427                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    428428                @$(outbase).rsp
    429 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     429ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
    430430        $(QUIET)$(TEST) -f $(out).manifest -- \
    431                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     431                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    432432endif
    433433endef
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette