diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-12-04 18:28:49 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-12-04 18:28:49 +0000 |
| commit | ebef6661dfaa292583d79576a694e71b5178fedf (patch) | |
| tree | 25f60c81ef8481a1cded79456ef1f2ba27bd6345 | |
| parent | 44a3cad930f61b672b0a8758f9e2df1b1d610a47 (diff) | |
| download | php-git-ebef6661dfaa292583d79576a694e71b5178fedf.tar.gz | |
MFH: fix build with Sun compiler, which doesn't support -O0
| -rw-r--r-- | acinclude.m4 | 16 | ||||
| -rw-r--r-- | configure.in | 8 |
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 db20e4f2b6..65da3ab572 100644 --- a/configure.in +++ b/configure.in @@ -122,6 +122,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 @@ -686,8 +687,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 |