summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-12-04 18:28:34 +0000
committerAntony Dovgal <tony2001@php.net>2006-12-04 18:28:34 +0000
commit8e7ab1b72fdb3e422e7fdc7a1d4ae1e924c0945b (patch)
tree7258530ae35d4b92b829b631e9121badf3e4e165
parent6aa5ed0d9c434fc9975ef8e55d4e60a1b9bdfdd2 (diff)
downloadphp-git-8e7ab1b72fdb3e422e7fdc7a1d4ae1e924c0945b.tar.gz
fix build with Sun compiler, which doesn't support -O0
-rw-r--r--acinclude.m416
-rw-r--r--configure.in8
2 files changed, 22 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d941ab7656..efc7ccca0f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2574,3 +2574,19 @@ ifelse([$1],[],:,[$1])
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
fi
])
+
+dnl
+dnl PHP_DETECT_ICC
+dnl
+AC_DEFUN([PHP_DETECT_ICC],
+[
+ ICC="no"
+ AC_MSG_CHECKING([for icc])
+ AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+ ICC="no"
+ AC_MSG_RESULT([no]),
+ ICC="yes"
+ AC_MSG_RESULT([yes])
+ )
+])
+
diff --git a/configure.in b/configure.in
index 837732560a..f6032c780b 100644
--- a/configure.in
+++ b/configure.in
@@ -120,6 +120,7 @@ dnl Checks for programs.
dnl -------------------------------------------------------------------------
AC_PROG_CC
+PHP_DETECT_ICC
AC_PROG_CC_C_O
dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
dnl AC_PROG_CC_STDC
@@ -684,8 +685,11 @@ if test "$PHP_DEBUG" = "yes"; then
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
changequote([,])
- CFLAGS="$CFLAGS -O0"
- CXXFLAGS="$CXXFLAGS -O0"
+ dnl add -O0 only if GCC or ICC is used
+ if test "$GCC" = "yes" || test "$ICC" = "yes"; then
+ CFLAGS="$CFLAGS -O0"
+ CXXFLAGS="$CXXFLAGS -O0"
+ fi
else
PHP_DEBUG=0
ZEND_DEBUG=no