# HG changeset patch
# User bjarni <bjarni@openttd.org>
# Date 1217168184 0
# Node ID 62bd9318bda88a09295e18308011ed1ad6fa0cf4
# Parent  7f6ad9b49ad1fd57f6e752de8dbe1fd565815551
(svn r13849) -Fix: [OSX] 10.5 appears to be more picky when setting up compiling of universal binaries

diff --git a/config.lib b/config.lib
--- a/config.lib
+++ b/config.lib
@@ -1286,7 +1286,7 @@
 
 	if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then
 		CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
-		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
+		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk -mmacosx-version-min=10.4"
 	fi
 
 	if [ -n "$personal_dir" ]; then
@@ -2247,7 +2247,7 @@
 	T_LDFLAGS="$LDFLAGS"
 	if [ "$with_osx_sysroot" = "3" ]; then
 		T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
-		T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
+		T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=10.4"
 	fi
 
 	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
diff --git a/src/unix.cpp b/src/unix.cpp
--- a/src/unix.cpp
+++ b/src/unix.cpp
@@ -144,7 +144,7 @@
 	/* Work around buggy iconv implementation where inbuf is wrongly typed as
 	 * non-const. Correct implementation is at
 	 * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */
-#ifdef HAVE_BROKEN_ICONV
+#if defined(HAVE_BROKEN_ICONV) && !defined(__APPLE__)
 	char *inbuf = (char*)name;
 #else
 	const char *inbuf = name;