Changeset 2902 for trunk/kBuild/tools


Ignore:
Timestamp:
Sep 9, 2016, 7:15:22 PM (9 years ago)
Author:
bird
Message:

Made link work inside kWorker too.

Location:
trunk/kBuild/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2895 r2902  
    6969TOOL_VCC100AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/cl.exe
    7070TOOL_VCC100AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/ml64.exe
    71 TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/lib.exe
     71#TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/lib.exe - just an exec wrapper for the below
     72TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/link.exe /LIB
    7273TOOL_VCC100AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/link.exe
    7374TOOL_VCC100AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/dumpbin.exe
    … …  
    8283   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    8384  endif
     85  TOOL_VCC100AMD64_KSUBMIT_DD = $(TOOL_VCC100AMD64_KSUBMIT) --
    8486 endif
    8587endif
    … …  
    302304                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    303305                        ,\"$(arg)\")
    304         $(QUIET)$(TOOL_VCC100AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     306        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    305307endef
    306308
    … …  
    332334                    $(subst /,\\,$(libs)) \
    333335                        ,\"$(arg)\")
    334         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
     336        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
    335337                /OUT:$(out) \
    336338                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    374376                    $(subst /,\\,$(libs)) \
    375377                        ,\"$(arg)\")
    376         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
     378        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
    377379                /OUT:$(out) \
    378380                /IMPLIB:$(outbase).lib \
    … …  
    420422                    $(subst /,\\,$(libs)) \
    421423                        ,\"$(arg)\")
    422         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
     424        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
    423425                /OUT:$(out) \
    424426                /MAPINFO:EXPORTS /INCREMENTAL:NO \

  • trunk/kBuild/tools/VCC100X86.kmk

    r2895 r2902  
    6868TOOL_VCC100X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
    6969TOOL_VCC100X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/ml.exe
    70 TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe
     70#TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe - just an exec wrapper for the below
     71TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe /LIB
    7172TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
    7273TOOL_VCC100X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/dumpbin.exe
    … …  
    7778 ifeq ($(KBUILD_HOST),win)
    7879  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     80  TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) --
    7981 endif
    8082endif
    … …  
    299301                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    300302                        ,\"$(arg)\")
    301         $(QUIET)$(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     303        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    302304endef
    303305
    … …  
    329331                    $(subst /,\\,$(libs)) \
    330332                        ,\"$(arg)\")
    331         $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
     333        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
    332334                /OUT:$(out) \
    333335                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    371373                    $(subst /,\\,$(libs)) \
    372374                        ,\"$(arg)\")
    373         $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
     375        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
    374376                /OUT:$(out) \
    375377                /IMPLIB:$(outbase).lib \
    … …  
    417419                    $(subst /,\\,$(libs)) \
    418420                        ,\"$(arg)\")
    419         $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
     421        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
    420422                /OUT:$(out) \
    421423                /MAPINFO:EXPORTS /INCREMENTAL:NO \
Note: See TracChangeset for help on using the changeset viewer.