Changeset 76024 in vbox

Timestamp:

Dec 6, 2018 7:31:59 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,Makefile.kmk: Adjustments for targeting old OS X versions. bugref:4802

File:

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

trunk/Config.kmk

@@ -2221 +2221 @@
  endif
 
+# Where to search for SDKs.
+VBOX_PATH_MACOSX_SDK_ROOT_DIRS ?= \
+        $(VBOX_PATH_MACOSX_SDK_ROOT) \
+        $(KBUILD_DEVTOOLS)/darwin.x86/SDKs/ \
+        $(KBUILD_DEVTOOLS)/darwin.amd64/SDKs/ \
+        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1/SDKs \
+        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v3.2.6/SDKs
+
  # Figure the default SDK location and obsolete linker tricks.
  ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
@@ -2231 +2239 @@
    endif
   endif
-  VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk
+  ifndef VBOX_PATH_MACOSX_SDK
+VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
+        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk )
+  endif
  else
-  VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
+  ifndef VBOX_PATH_MACOSX_SDK
+VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
+        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk )
+  endif
  endif