summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-12-01 21:10:03 +0100
committerPeter Kokot <peterkokot@gmail.com>2018-12-02 11:41:57 +0100
commitbde96f293a9d3bf9a61039a93c9b7c2d098cb119 (patch)
tree5196ebfa51c8c96eeed331e4d28203cc1f0eae04
parent494d5d2429878882a371d24949acfce94f5927dd (diff)
downloadphp-git-bde96f293a9d3bf9a61039a93c9b7c2d098cb119.tar.gz
Remove support for Rhapsody code name
The Rhapsody code name was once used for computers with operating system by Apple and was mostly replaced with a newer code name Darwin: - https://en.wikipedia.org/wiki/Rhapsody_(operating_system) - https://en.wikipedia.org/wiki/Darwin_(operating_system) This patch removes obsolete checks from the *nix build script files.
-rw-r--r--Zend/Zend.m46
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 7 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index b0d7923e65..08afdf0832 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -39,12 +39,6 @@ if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
fi
-dnl Hack to work around a Mac OS X cpp problem
-dnl Known versions needing this workaround are 5.3 and 5.4
-if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
- CPPFLAGS="$CPPFLAGS -traditional-cpp"
-fi
-
AC_CHECK_HEADERS(
inttypes.h \
stdint.h \
diff --git a/configure.ac b/configure.ac
index f6ccd62487..8f5a54c728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,7 @@ case $host_alias in
*dgux*)
CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
;;
- *darwin*|*rhapsody*)
+ *darwin*)
if test -n "$GCC"; then
PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes)
if test "$gcc_no_cpp_precomp" = "yes"; then