bootsectors

Timestamp:

Jan 9, 2016 9:10:03 PM (9 years ago)

Author:

vboxsync

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

104959

Message:

bs3kit: locate the patched nasm added to tools (kBuild/tools/NASM.kmk is so ancient it doesn't look in the alternative host arch directory).

File:

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

-              r59300
+              r59301
 # NASM tool with dependency workarounds (change dir to force consistent results; add -MP).
+# Requires http://permalink.gmane.org/gmane.comp.lang.nasm.devel/3704 to work.
 include $(KBUILD_PATH)/tools/NASM.kmk
 TOOL_VBoxNasm = Our version of the NASM tool
+TOOL_VBoxNasm_PATH    ?= $(PATH_TOOL_NASM)
+ifneq ($(PATH_TOOL_NASM),)
+ifndef TOOL_VBoxNasm_PATH
+ TOOL_VBoxNasm_PATH   := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/nasm/v*.*)))
+ if "$(TOOL_VBoxNasm_PATH)" == "" && "$(KBUILD_DEVTOOLS_HST_ALT)" != ""
+  TOOL_VBoxNasm_PATH  := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/nasm/v*.*)))
+ endif
+endif
+ifneq ($(TOOL_VBoxNasm_PATH),)
  TOOL_VBoxNasm_AS     ?= $(TOOL_VBoxNasm_PATH)/nasm$(HOSTSUFF_EXE)
 else

Note: See TracChangeset for help on using the changeset viewer.