Changeset 91781 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 17, 2021 12:21:28 PM (3 years ago)

Author:

vboxsync

Message:

Support/Makefile.kmk: Fixes for bugref:10124

File:

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

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

@@ -542 +542 @@
 
 else ifeq ($(VBOX_LDR_FMT),macho)
- SUPR0_VBOX_KMK_FILE = $(PATH_OUT)/SUPR0/files.kmk
+ $(call KB_FN_DO_PASS0_ON_TARGET,SUPR0) # Defines SUPR0_0_OUTDIR so we can use it in SUPR0_VBOX_FILES w/o needing $$.
+ SUPR0_VBOX_KMK_FILE = $(SUPR0_0_OUTDIR)/files.kmk
  include $(SUPR0_VBOX_KMK_FILE)
  SUPR0_SOURCES       = $(SUPR0_VBOX_FILES)
- SUPR0_CLEAN         = $(SUPR0_VBOX_FILES) $$(SUPR0_0_OUTDIR)/SUPR0.asm $(SUPR0_VBOX_KMK_FILE) $(SUPR0_VBOX_KMK_FILE).ts
+ SUPR0_CLEAN         = $(SUPR0_VBOX_FILES) $(SUPR0_0_OUTDIR)/SUPR0.asm $(SUPR0_VBOX_KMK_FILE) $(SUPR0_VBOX_KMK_FILE).ts
 
  # Generate a make include file which lists the wrapper source files.
@@ -560 +561 @@
         $(QUIET)$(CP) --changed -fv "$@" $(SUPR0_VBOX_KMK_FILE)
 
- $$(SUPR0_0_OUTDIR)/SUPR0.asm +| $(SUPR0_VBOX_FILES): \
+ $(SUPR0_0_OUTDIR)/SUPR0.asm +| $(SUPR0_VBOX_FILES): \
                 $(PATH_SUB_CURRENT)/SUPDrv.cpp \
                 $(PATH_SUB_CURRENT)/SUPR0-asm.sed \
                | $$(dir $$@) $(VBOX_FILESPLIT)
 #       $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
-        $(call MSG_GENERATE,,$(SUPR0_VBOX_KMK_FILE))
+        $(call MSG_GENERATE,,SUPR0.asm and friends)
         $(QUIET)$(RM) -f -- "$@"
         $(QUIET)$(SED) --output "$@" -f "$(VBOX_PATH_SUP_SRC)/SUPR0-asm.sed" "$(VBOX_PATH_SUP_SRC)/SUPDrv.cpp"