Changeset 5691 in vbox for trunk/src/recompiler

Timestamp:

Nov 11, 2007 5:40:18 PM (17 years ago)

Author:

vboxsync

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

26037

Message:

Mac OS X version 10.5 build hacks.

File:

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

trunk/src/recompiler/Makefile.kmk

@@ -19 +19 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -27 +27 @@
 #  distribution. VirtualBox OSE is distributed in the hope that it will
 #  be useful, but WITHOUT ANY WARRANTY of any kind.
+#
 
 
@@ -34 +35 @@
 
 BLDPROGS              = dyngen
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifneq ($(or $(eq $(BUILD_TARGET_ARCH),amd64) , $(VBOX_TARGET_MAC_OS_X_VERSION_10_5)),)
  SYSMODS              = VBoxREM2
  REM_MOD              = VBoxREM2
@@ -60 +61 @@
  REM_USE_NOCRT := 1
 endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifeq ($(REM_MOD),VBoxREM2)
  REM_USE_NOCRT := 1
 endif
@@ -125 +126 @@
  $(REM_MOD)_CLEAN           = $(FILE_OP_OBJ) $(PATH_$(REM_MOD))/op.S.dep
 endif
-#$(REM_MOD)_SOURCES.os2      = $(PATH_TARGET)/$(REM_MOD).def
 $(REM_MOD)_SOURCES.win.x86  = $(REM_MOD).def
 ifneq ($(REM_MOD),VBoxREM2)
@@ -137 +137 @@
  $(REM_MOD)_CFLAGS.amd64    = -O2
  $(REM_MOD)_CFLAGS.debug    = -O0
- $(REM_MOD)_CFLAGS.darwin   = -fno-common -mdynamic-no-pic
  ifdef ($(BUILD_TARGET_ARCH),x86)
   $(REM_MOD)_CFLAGS.release+= -fomit-frame-pointer -fno-gcse
@@ -153 +152 @@
   ifeq ($(BUILD_TARGET),l4)
    $(REM_MOD)_LIBS          += \
-        $(L4_LIBDIR)/libuc.0.s.so
+        $(L4_LIBDIR)/libuc.0.s.so
   endif
   $(REM_MOD)_LIBS.darwin    = \
         $(TARGET_VBoxREMImp)
-#       $(PATH_BIN)/VBoxREMImp.dylib
   $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -multiply_defined warning  #-install_name @executable_path/$(REM_MOD).dylib#
+  $(REM_MOD)_CFLAGS.darwin   = -fno-common -mdynamic-no-pic
  else
   $(REM_MOD)_LIBS           = \
         $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
   $(REM_MOD)_SYSSUFF        = .rel
+  $(REM_MOD)_LDFLAGS.darwin = -nostdlib -static
+  $(REM_MOD)_CFLAGS.darwin  = -fno-common -static -mno-dynamic-no-pic
  endif
 
@@ -256 +257 @@
 
 
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ifeq ($(REM_MOD),VBoxREM2)
 #
 # The VBoxREM2 wrapper.
@@ -375 +376 @@
 ifeq ($(BUILD_TARGET),darwin)
  ifeq ($(filter-out i386-elf-gcc%, $(VBOX_RECOMPILER_OP_GCC)),)
-  COMPILE_OP_CMDS := $(filter-out -mdynamic-no-pic, $(COMPILE_OP_CMDS))
+  COMPILE_OP_CMDS := $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS))
  endif
 endif