Changeset 29012 in vbox

Timestamp:

May 4, 2010 12:29:35 PM (15 years ago)

Author:

vboxsync

Message:

recompiler/Makefile.kmk: darwin.amd64 + cleanup.

File:

• trunk/src/recompiler/Makefile.kmk (modified) (5 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -20 +20 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86)
+ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64)
  include $(PATH_SUB_CURRENT)/Makefile-old.kmk
 else  # new stuff
@@ -121 +121 @@
  #
  SYSMODS += VBoxRemPrimary
- VBoxRemPrimary_TEMPLATE  = VBOXNOCRTGAS
- VBoxRemPrimary_NAME      = VBoxREM2
- VBoxRemPrimary_DEFS     += LOG_USE_C99 $(ARCH_BITS_DEFS)
- VBoxRemPrimary_SOURCES  += \
+ VBoxRemPrimary_TEMPLATE   = VBOXNOCRTGAS
+ VBoxRemPrimary_NAME       = VBoxREM2
+ VBoxRemPrimary_DEFS      += LOG_USE_C99 $(ARCH_BITS_DEFS)
+ VBoxRemPrimary_SOURCES   += \
         Sun/e_powl-$(KBUILD_TARGET_ARCH).S
- VBoxRemPrimary_INCS     += \
+ VBoxRemPrimary_INCS      += \
         Sun/crt
- VBoxRemPrimary_SYSSUFF   = .rel
- VBoxRemPrimary_LIBS      = \
+ VBoxRemPrimary_SYSSUFF    = .rel
+ VBoxRemPrimary_LIBS       = \
         $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
- VBoxRemPrimary_POST_CMDS = $(NO_SUCH_VARIABLE)
+ VBoxRemPrimary_POST_CMDS  = $(NO_SUCH_VARIABLE)
+ VBOX_REM_WRAPPER          = 2
 
 else if "$(KBUILD_TARGET_ARCH)" == "x86" && defined(VBOX_WITH_64_BITS_GUESTS)
@@ -148 +149 @@
  VBoxRemPrimary_NAME       = VBoxREM32
  VBoxRemPrimary_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM32.dylib
+ VBOX_REM_WRAPPER          = 32
 
  #
@@ -159 +161 @@
  VBoxREM64_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM64.dylib
 
-## @todo else ifdef VBOX_WITHOUT_REM_LDR_CYCLE
 else
  #
@@ -166 +167 @@
  DLLS += VBoxRemPrimary
  VBoxRemPrimary_NAME       = VBoxREM
- VBoxRemPrimary_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM.dylib
-endif
-
-
-ifn1of ($(DLLS),VBoxREM)
+ VBoxRemPrimary_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM3.dylib
+endif
+
+
+ifdef VBOX_REM_WRAPPER
  #
  # VBoxREM - Wrapper for loading VBoxREM2, VBoxREM32 or VBoxREM64.