From 64d0bdba1149a78a1fab7efaac26a45ea719230e Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Tue, 15 May 2007 03:42:15 -0400 Subject: Mac OS X universal build fixes -- Set -isysroot in CFLAGS and -syslibroot in LDFLAGS early -- Patch libtool's sys_lib_search_path_spec to not search /usr/lib, et al., and instead search /Developer/SDKs/MacOSX10.4u.sdk/usr/lib so that it'll find universal versions of stuff, libiconv.dylib in particular. There's a libiconv.la file hanging around in /usr/lib that breaks everything otherwise. --- m4/macosx.m4 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'm4') diff --git a/m4/macosx.m4 b/m4/macosx.m4 index 8a66c49b9..0151b41e9 100644 --- a/m4/macosx.m4 +++ b/m4/macosx.m4 @@ -18,9 +18,11 @@ AC_DEFUN([MACOSX_UNIVERSAL_BINARIES], [ AC_MSG_ERROR([Universal binaries can only be built on Darwin]) ;; esac + AC_SUBST(UNIVERSAL_ARCHES) + + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" - UNIVERSAL_CFLAGS="$UNIVERSAL_CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - UNIVERSAL_LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" if test x"$UNIVERSAL_ARCHES" != x"" ; then # Forcibly disable dependency tracking for Universal builds, because -M # does not work with multiple -arch arguments on the gcc command-line. @@ -38,7 +40,4 @@ AC_DEFUN([MACOSX_UNIVERSAL_BINARIES], [ fi fi AM_CONDITIONAL([MACOSX_UNIVERSAL_BINARY], [test x"$enable_macosx_universal" = x"yes"]) - AC_SUBST(UNIVERSAL_ARCHES) - AC_SUBST(UNIVERSAL_CFLAGS) - AC_SUBST(UNIVERSAL_LDFLAGS) ])dnl MACOSX_UNIVERSAL_BINARIES -- cgit v1.2.3