Changeset 84467 in vbox

Timestamp:

May 22, 2020 8:59:50 PM (5 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: Don't include VCC*.kmk files more than once. bugref:8489

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -113 +113 @@
 # The compiler runtime DLLs.
 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
- include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk
- include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk
+ ifndef TOOL_$(VBOX_VCC_TOOL)
+  include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk
+ endif
+ ifndef TOOL_$(VBOX_VCC_TOOL_STEM)X86
+  include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk
+ endif
  ifdef PATH_TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST
 InstallExternalLibs_SOURCES += \