Changeset 91776 in vbox

Timestamp:

Oct 17, 2021 11:01:32 AM (4 years ago)

Author:

vboxsync

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

147561

Message:

SUPDrv/darwin: Build fix for the switch-back-to-kernel-stack change. bugref:10124

File:

• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -27 +27 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+#
+# Globals.
+#
+VBOX_PATH_SUP_SRC            := $(PATH_SUB_CURRENT)
+VBOX_PATH_SUPR3_CERTIFICATES := $(PATH_SUB_CURRENT)/Certificates
+VBOX_PATH_RUNTIME_SRC        ?= $(PATH_ROOT)/src/VBox/Runtime
+
 
 #
@@ -103 +111 @@
 
 VBOX_SUP_WIN_CERT_NAMES := $(foreach cert,$(VBOX_SUP_WIN_CERTS),$(firstword $(subst =,$(SPACE) ,$(cert))))
-VBOX_PATH_SUPR3_CERTIFICATES := $(PATH_SUB_CURRENT)/Certificates
 
 # 1=name, 2=filter, 3=buildcert?.
@@ -201 +208 @@
 # The static part of the hardened support library (ring-3).
 #
-VBOX_PATH_RUNTIME_SRC ?= $(PATH_ROOT)/src/VBox/Runtime
 SUPR3HardenedStatic_TEMPLATE = VBOXR3HARDENEDLIB
 SUPR3HardenedStatic_DEFS     = IN_SUP_HARDENED_R3
@@ -551 +557 @@
         $(QUIET)$(RM) -f -- "$@"
         $(QUIET)$(MKDIR) -p -- "$(@D)"
-        $(QUIET)$(SED) --output "$@" -f "$(PATH_SUB_CURRENT)/SUPR0-asm-files.sed" "$(PATH_SUB_CURRENT)/SUPDrv.cpp"
+        $(QUIET)$(SED) --output "$@" -f "$(VBOX_PATH_SUP_SRC)/SUPR0-asm-files.sed" "$(VBOX_PATH_SUP_SRC)/SUPDrv.cpp"
         $(QUIET)$(CP) --changed -fv "$@" $(SUPR0_VBOX_KMK_FILE)
 
@@ -561 +567 @@
         $(call MSG_GENERATE,,$(SUPR0_VBOX_KMK_FILE))
         $(QUIET)$(RM) -f -- "$@"
-        $(QUIET)$(SED) --output "$@" -f "$(PATH_SUB_CURRENT)/SUPR0-asm.sed" "$(PATH_SUB_CURRENT)/SUPDrv.cpp"
+        $(QUIET)$(SED) --output "$@" -f "$(VBOX_PATH_SUP_SRC)/SUPR0-asm.sed" "$(VBOX_PATH_SUP_SRC)/SUPDrv.cpp"
         $(VBOX_FILESPLIT) "$@" "$(dir $@)"