Changeset 67289 in vbox for trunk/Config.kmk

Timestamp:

Jun 8, 2017 9:28:45 AM (7 years ago)

Author:

vboxsync

Message:

Config.kmk: on win.amd64 don't depend on MingW32

File:

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

trunk/Config.kmk

@@ -1983 +1983 @@
 endif
 
-ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.x86)
- VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
-else ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
- VBOX_NM ?= $(PATH_TOOL_MINGWW64)/bin/nm.exe -p
+ifeq ($(KBUILD),win)
+ ifeq ($(KBUILD_TARGET_ARCH),x86) # Normally we should test for KBUILD_HOST_ARCH but we only require MINGWW64 for 64-bit _targets_
+  VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
+ else
+  VBOX_NM ?= $(PATH_TOOL_MINGWW64)/bin/nm.exe -p
+ endif
 else ifeq ($(KBUILD_HOST),darwin) # Xcode 7.3.1 nm doesn't like -t, and -x behaves very differently.  Throwing in -B (bsd) to make sure.
  VBOX_NM ?= $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN_BIN_SLASH)nm -p $(if-expr \