儲存庫 vbox 的更動 84370

時間撮記:

2020-5-19 下午12:47:39 (5 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

138059

訊息:

/Makefile.kmk: Adjusted VCC141/VCC142 runtime DLL installation to take into account that AMD64 and X86 can have different sets of DLLs. bugref:8489

檔案:

• trunk/Makefile.kmk (修改) (4 筆差異)

trunk/Makefile.kmk

@@ -118 +118 @@
 InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT)/), \
-                $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CPP_DLLS)) \
+                $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)) \
         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
@@ -124 +124 @@
 InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT)/), \
-                $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CPP_DLLS)) \
+                $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)) \
         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
   endif
@@ -130 +130 @@
 InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_DEBUG_CRT)/), \
-                $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CPP_DLLS)))) \
+                $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)))) \
         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
@@ -136 +136 @@
 InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_DEBUG_CRT)/), \
-                $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST_CPP_DLLS)))) \
+                $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
    endif