Skip to content

Commit f275cd0

Browse files
author
Gwynne Raskind
committed
once and for all remove the old broken Darwin hack, replace it with the new and much cleaner and simpler one
1 parent f1ffc9b commit f275cd0

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

configure.in

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,6 @@ dnl or the contents of libs.
122122
$php_shtool mkdir -p libs
123123
rm -f libs/*
124124

125-
dnl Darwin 9 hack
126-
dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5
127-
dnl causes errors in all current and past versions of Autoconf, we do a little
128-
dnl messing with the CFLAGS here to trick it.
129-
php_did_darwin9_cheat=0
130-
case $host_alias in
131-
*darwin9*)
132-
hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'`
133-
if test x"$hasg" = "x"; then
134-
php_did_darwin9_cheat=1
135-
CFLAGS="$CFLAGS -gstabs"
136-
fi
137-
;;
138-
esac
139-
140125
dnl Checks for programs.
141126
dnl -------------------------------------------------------------------------
142127

@@ -1339,6 +1324,14 @@ PHP_CONFIGURE_PART(Configuring libtool)
13391324

13401325
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
13411326

1327+
dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6.
1328+
dnl This hack works around it. Ugly.
1329+
case $host_alias in
1330+
*darwin9*|*darwin10*)
1331+
ac_cv_exeext=
1332+
;;
1333+
esac
1334+
13421335
dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).
13431336
dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler.
13441337
AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
@@ -1362,15 +1355,6 @@ SHARED_LIBTOOL='$(LIBTOOL)'
13621355

13631356
CC=$old_CC
13641357

1365-
dnl Finish the Darwin hack
1366-
if test "$php_did_darwin9_cheat" -eq 1; then
1367-
if test "$PHP_DEBUG" = "1"; then
1368-
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'`
1369-
else
1370-
CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs//g'`
1371-
fi
1372-
fi
1373-
13741358
PHP_CONFIGURE_PART(Generating files)
13751359

13761360
CXXFLAGS_CLEAN=$CXXFLAGS

0 commit comments

Comments
 (0)