Changeset 11725 in vbox for trunk/src/recompiler/Makefile.kmk

Timestamp:

Aug 27, 2008 10:21:47 PM (16 years ago)

Author:

vboxsync

Message:

#3076: Merged in the branch with the alternate driver authentication method. (34468:HEAD)

File:

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

trunk/src/recompiler/Makefile.kmk

@@ -169 +169 @@
   $(REM_MOD)_LIBS.darwin    = \
         $(TARGET_VBoxREMImp)
-  $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -multiply_defined warning  #-install_name @executable_path/$(REM_MOD).dylib#
+  $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -multiply_defined warning # -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(REM_MOD).dylib
+  $(REM_MOD)_POST_CMDS.darwin = install_name_tool -id $(VBOX_DYLD_EXECUTABLE_PATH)/$(REM_MOD).dylib $(out)
   $(REM_MOD)_CFLAGS.darwin   = -fno-common -mdynamic-no-pic
  else
@@ -203 +204 @@
  $(REM_MOD)_DEFS           += _GNU_SOURCE _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _REENTRANT
 
- $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -install_name @executable_path/$(REM_MOD).dylib -multiple_defined warning
+ $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(REM_MOD).dylib -multiple_defined warning
  $(REM_MOD)_LDFLAGS.l4      = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib -Wl,--no-undefined
  $(REM_MOD)_LDFLAGS.linux   = $(VBOX_LD_as_needed)
@@ -293 +294 @@
         VBoxREMWrapper.cpp \
         VBoxREMWrapperA.asm
-VBoxREM_LDFLAGS.darwin = -install_name @executable_path/VBoxREM.dylib
+VBoxREM_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM.dylib
 VBoxREM_LIBS           = \
         $(LIB_VMM) \
@@ -316 +317 @@
 VBoxREMImp_SONAME           = VBoxREM$(SUFF_DLL)
 endif
-VBoxREMImp_LDFLAGS.darwin   = -install_name @executable_path/VBoxREM.dylib
-#VBoxREMImp_LDFLAGS.darwin   = -install_name VBoxREM.dylib
+VBoxREMImp_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM.dylib
 VBoxREMImp_LDFLAGS.l4       = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib