Changeset 2738 in kBuild

Timestamp:

Dec 23, 2014 9:16:26 PM (10 years ago)

Author:

bird

Message:

Darwin build hack: KBUILD_MACOSX_WHATEVER_MODE=1.

File:

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

trunk/Config.kmk

@@ -224 +224 @@
   export KBUILD_MACOSX_VERSION := $(expr $(firstword $(subst ., ,$(shell uname -r))) - 4)
  endif
+ #ifndef KBUILD_XCODE_VERSION
+ # export KBUILD_XCODE_VERSION := $(shell xcodebuild -version | kmk_sed -e '/Xcode/!d' -e 's/Xcode *//')
+ #endif
  ifndef KBUILD_MACOSX_TARGET_VERSION
   if $(KBUILD_TARGET_ARCH) == amd64
@@ -231 +234 @@
   endif
  endif
- if $(KBUILD_MACOSX_TARGET_VERSION) == 4
-  TOOL_GCC4MACHO_SUFFIX         = -4.0
-  TOOL_GXX4MACHO_SUFFIX         = -4.0
- else if $(KBUILD_MACOSX_TARGET_VERSION) >= 5
-  TOOL_GCC4MACHO_SUFFIX         = -4.2
-  TOOL_GXX4MACHO_SUFFIX         = -4.2
- endif
- ifndef KBUILD_MACOSX_SDK
-  KBUILD_MACOSX_SDK            := /Developer/SDKs/MacOSX10.$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_VERSION)==4,u,).sdk
-  ifeq ($(wildcard $(KBUILD_MACOSX_SDK)),)
-   KBUILD_MACOSX_SDK           := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform$(KBUILD_MACOSX_SDK)
+ ifndef KBUILD_MACOSX_WHATEVER_MODE
+  if $(KBUILD_MACOSX_TARGET_VERSION) == 4
+   TOOL_GCC4MACHO_SUFFIX                = -4.0
+   TOOL_GXX4MACHO_SUFFIX                = -4.0
+  else if $(KBUILD_MACOSX_TARGET_VERSION) >= 5
+   TOOL_GCC4MACHO_SUFFIX                = -4.2
+   TOOL_GXX4MACHO_SUFFIX                = -4.2
   endif
- endif
+  ifndef KBUILD_MACOSX_SDK
+   KBUILD_MACOSX_SDK            := /Developer/SDKs/MacOSX10.$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_VERSION)==4,u,).sdk
+   ifeq ($(wildcard $(KBUILD_MACOSX_SDK)),)
+    KBUILD_MACOSX_SDK           := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform$(KBUILD_MACOSX_SDK)
+   endif
+  endif
+ endif # !KBUILD_MACOSX_WHATEVER_MODE
  TEMPLATE_BIN_TOOL              = GCC4MACHO
- TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -isysroot $(KBUILD_MACOSX_SDK)
+ TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-isysroot $(KBUILD_MACOSX_SDK))
  ifeq ($(USER),bird)
   TEMPLATE_BIN_CFLAGS          += -Wall $(GCC_Wextra) -pedantic -Wno-unused-parameter -Wno-long-long
@@ -252 +257 @@
  TEMPLATE_BIN_CFLAGS.profile    = -O3 -pg
  TEMPLATE_BIN_CFLAGS.release    = -O3
- TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -Wl,-syslibroot,$(KBUILD_MACOSX_SDK)
+ TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) $(if $(KBUILD_MACOSX_WHATEVER_MODE),,-Wl,-syslibroot,$(KBUILD_MACOSX_SDK))
  if $(KBUILD_MACOSX_TARGET_VERSION) == 4 && $(KBUILD_MACOSX_VERSION) >= 5
   TEMPLATE_BIN_LDFLAGS         += -classic_ld