Changeset 92928 in vbox

Timestamp:

Dec 15, 2021 1:21:39 PM (3 years ago)

Author:

vboxsync

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

148893

Message:

/Config.kmk: VBOX_PATH_SIGN_TOOLS should be the same as the SDK bin directory when VBOX_WITH_NEW_WINDOWS_SDK is ineffect. bugref:10116

File:

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

trunk/Config.kmk

@@ -3758 +3758 @@
   endif
   ifndef VBOX_PATH_SIGN_TOOLS
-   VBOX_PATH_SIGN_TOOLS := $(firstword $(rsort $(wildcard \
-        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v8.1*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
-   ifeq ($(VBOX_PATH_SIGN_TOOLS),)
+   ifdef VBOX_WITH_NEW_WINDOWS_SDK
+    VBOX_PATH_SIGN_TOOLS = $(PATH_SDK_$(VBOX_WINPSDK)_BIN)
+   else
     VBOX_PATH_SIGN_TOOLS := $(firstword $(rsort $(wildcard \
-        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v10*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
+        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v8.1*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
     ifeq ($(VBOX_PATH_SIGN_TOOLS),)
-     VBOX_PATH_SIGN_TOOLS := $(VBOX_PATH_SELFSIGN)
+     VBOX_PATH_SIGN_TOOLS := $(firstword $(rsort $(wildcard \
+        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v10*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
+     ifeq ($(VBOX_PATH_SIGN_TOOLS),)
+      VBOX_PATH_SIGN_TOOLS := $(VBOX_PATH_SELFSIGN)
+     endif
     endif
    endif