Changeset 15333 in vbox

Timestamp:

Dec 11, 2008 6:56:36 PM (16 years ago)

Author:

vboxsync

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

40764

Message:

TEMPLATE_VBOXBLDPROG_DEFS.darwin: added; TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin: work with opional 10.5 SDK

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3306 +3306 @@
 TEMPLATE_VBOXBLDPROG_TOOL                = GXX4MACHO
   if 0 # enable this if you have problems linking xpidl and is running 10.5 or later.
+TEMPLATE_VBOXBLDPROG_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
 TEMPLATE_VBOXBLDPROG_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_10_5_CFLAGS) -fno-common
 TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
@@ -3311 +3312 @@
 TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
   else
+TEMPLATE_VBOXBLDPROG_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_DEFS)
 TEMPLATE_VBOXBLDPROG_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
 TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -221 +221 @@
 TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET))
 TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET_ARCH))
+ifeq ($(KBUILD_TARGET),darwin)
+TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET)      = $(filter-out $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET)),$(TEMPLATE_VBOXR3NP_LDFLAGS.$(KBUILD_TARGET))) $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin)
+else
 TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET))
+endif
 TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))