Changeset 1402 in vbox for trunk

Timestamp:

Mar 12, 2007 4:15:33 AM (18 years ago)

Author:

vboxsync

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

19400

Message:

Use yasm on darwin.

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -128 +128 @@
 VBOX_VERSION_BUILD = 99
 # Full version string (may include more than just x.y.z, but no spaces or other problematic chars).
-VBOX_VERSION_STRING = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
+VBOX_VERSION_STRING = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)-private
 # Same as VBOX_VERSION_STRING, deprecated.
 VBOX_VERSION = $(VBOX_VERSION_STRING)
@@ -345 +345 @@
 ifeq ($(BUILD_TARGET),darwin)
  VBOX_LDR_FMT = macho
- DONT_USE_YASM = 1 # yasm doesn't implement macho yet.
 endif
 ifeq ($(BUILD_TARGET),os2)
@@ -416 +415 @@
 endif
 ifeq ($(VBOX_LDR_FMT64),macho)
- VBOX_ASFLAGS_FMT64 = -f macho -DASM_FORMAT_MACHO
+ VBOX_ASFLAGS_FMT64 = -f macho64 -DASM_FORMAT_MACHO
  VBOX_ASFLAGS_DBFINFO64 = -g dwarf2
 endif
@@ -430 +429 @@
  VBOX_LDR_FMT_2_YASM_DBGINFO.elf   = -g dwarf2
  VBOX_LDR_FMT_2_YASM_DBGINFO.lx    = -g stabs
- VBOX_LDR_FMT_2_YASM_DBGINFO.macho = -g dwarf2
+ VBOX_LDR_FMT_2_YASM_DBGINFO.macho =
  VBOX_LDR_FMT_2_YASM_DBGINFO.pe    =
- VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -w+orphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
- VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -w+orphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
- VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -w+orphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
+ VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
+ VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
+ VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
 else
  VBOX_ASTOOL    = NASM