Changeset 23204 in vbox

Timestamp:

Sep 22, 2009 9:22:27 AM (15 years ago)

Author:

vboxsync

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

52651

Message:

OSX: fix gcc LD test for darwin; dynamically check for no_compact_linkedit, cause it is not available on older Xcode versions

File:

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

trunk/Config.kmk

@@ -1430 +1430 @@
   ifdef VBOX_WITH_COCOA_QT
    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
-   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= -Wl,-no_compact_linkedit
+   VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
   else
    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
@@ -1626 +1626 @@
 
 VBOX_GCC_CHECK_LD = $(shell \
-   if $(TOOL_$(VBOX_GCC_TOOL)_LD) -Wl,$(1) -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1 ;\
+   if $(TOOL_$(VBOX_GCC_TOOL)_LD) -Wl,$(1) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1 ;\
    then echo "-Wl,$(1)"; \
    else echo "$(2)"; fi; )
@@ -1703 +1703 @@
         $(APPEND) '$@' 'VBOX_GCC32_LIBGCC              ?= $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)'
         $(APPEND) '$@' 'VBOX_GCC32_Wno-variadic-macros ?= $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)'
+# darwin no_compact_linkedit starting at Xcode 3.2
+ifeq ($(KBUILD_HOST),darwin)
+        $(APPEND) '$@' 'VBOX_LD_no_compact_linkedit    ?= $(call VBOX_GCC_CHECK_LD,-no_compact_linkedit,)'
+endif
 
 include $(PATH_OUT)/GCCConfig.kmk