Changeset 2700 in kBuild

Timestamp:

Sep 20, 2013 12:33:51 AM (11 years ago)

Author:

bird

Message:

Hacks for building against newer mac os x SDKs.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/sed/lib/getline.c (modified) (1 diff)

trunk/Config.kmk

@@ -230 +230 @@
   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
+ 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
  TEMPLATE_BIN_TOOL              = GCC4MACHO
  TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -isysroot $(KBUILD_MACOSX_SDK)

trunk/src/sed/lib/getline.c

@@ -6 +6 @@
 
 #include <sys/types.h>
+#define getline stdio_getline   /* bird */
 #include <stdio.h>
+#undef getline                  /* bird */
 
 #ifdef HAVE_STRINGS_H