Changeset 2380 in kBuild

Timestamp:

Jan 13, 2010 10:20:45 PM (15 years ago)

Author:

bird

Message:

Config.kmk: build on mac os x 10.6

File:

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

trunk/Config.kmk

@@ -204 +204 @@
 ifeq ($(KBUILD_TARGET),darwin)
  ifndef KBUILD_MACOSX_VERSION
-  export KBUILD_MACOSX_VERSION := $(firstword $(subst ., ,$(shell uname -r)))
- endif
- KBUILD_MACOSX_SDK             ?= /Developer/SDKs/MacOSX10.4u.sdk
+  export KBUILD_MACOSX_VERSION := $(expr $(firstword $(subst ., ,$(shell uname -r))) - 4)
+ endif
+ ifndef KBUILD_MACOSX_TARGET_VERSION
+  if $(KBUILD_TARGET_ARCH) == amd64
+    KBUILD_MACOSX_TARGET_VERSION = 6
+  else
+    KBUILD_MACOSX_TARGET_VERSION = 4
+  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
+ KBUILD_MACOSX_SDK             ?= /Developer/SDKs/MacOSX10.$(KBUILD_MACOSX_TARGET_VERSION)$(if-expr $(KBUILD_MACOSX_TARGET_VERSION)==4,u,).sdk
  TEMPLATE_BIN_TOOL              = GCC4MACHO
- TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.4 -isysroot $(KBUILD_MACOSX_SDK)
+ TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -isysroot $(KBUILD_MACOSX_SDK)
  ifeq ($(USER),bird)
   TEMPLATE_BIN_CFLAGS          += -Wall -Wextra -pedantic -Wno-unused-parameter
@@ -215 +229 @@
  TEMPLATE_BIN_CFLAGS.profile    = -O3 -pg
  TEMPLATE_BIN_CFLAGS.release    = -O3
- TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=10.4 -Wl,-syslibroot,$(KBUILD_MACOSX_SDK)
- ifneq ($(int-ge $(KBUILD_MACOSX_VERSION),9),) # >= 10.5
+ TEMPLATE_BIN_LDFLAGS           = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -Wl,-syslibroot,$(KBUILD_MACOSX_SDK)
+ if $(KBUILD_MACOSX_TARGET_VERSION) == 4 && $(KBUILD_MACOSX_VERSION) >= 5
   TEMPLATE_BIN_LDFLAGS         += -classic_ld
  endif