Changeset 2902 for trunk/kBuild/tools/VCC100X86.kmk

Timestamp:

Sep 9, 2016, 7:15:22 PM (9 years ago)

Author:

bird

Message:

Made link work inside kWorker too.

File:

• trunk/kBuild/tools/VCC100X86.kmk (modified) (6 diffs)

trunk/kBuild/tools/VCC100X86.kmk

@@ -68 +68 @@
 TOOL_VCC100X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
 TOOL_VCC100X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/ml.exe
-TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe
+#TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe - just an exec wrapper for the below
+TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe /LIB
 TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
 TOOL_VCC100X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/dumpbin.exe
@@ -77 +78 @@
  ifeq ($(KBUILD_HOST),win)
   TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+  TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) --
  endif
 endif
@@ -299 +301 @@
                         $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -329 +331 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -371 +373 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -417 +419 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \