summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-07-12 12:59:28 +0000
committerFelipe Pena <felipe@php.net>2010-07-12 12:59:28 +0000
commit6f32b2cda4bf8b24eebddea830a834683b86097b (patch)
tree4138cffcc2253df0c3bfa76d7466e2889501e038
parent3c8d3c08ac482c1c82a723d15c12cab552765b5e (diff)
downloadphp-git-6f32b2cda4bf8b24eebddea830a834683b86097b.tar.gz
- Defined NDEBUG to avoid checks for tracefile, and added -l flag
-rw-r--r--Zend/zend_language_parser.y2
-rw-r--r--configure.in4
-rw-r--r--win32/build/config.w324
3 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 823b9b9874..4455c44903 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -29,6 +29,8 @@
#include "zend_globals.h"
#include "zend_API.h"
#include "zend_constants.h"
+
+#define NDEBUG
}
%name zend_lang_parse
diff --git a/configure.in b/configure.in
index f6c85d29ce..aee8ceec52 100644
--- a/configure.in
+++ b/configure.in
@@ -1054,10 +1054,10 @@ LIBZEND_OTHER_CHECKS
if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
AC_DEFINE(ZTS,1,[ ])
PHP_THREAD_SAFETY=yes
- LEMON_FLAGS="-q D=ZTS"
+ LEMON_FLAGS="-l -q D=ZTS"
else
PHP_THREAD_SAFETY=no
- LEMON_FLAGS="-q"
+ LEMON_FLAGS="-l -q"
fi
PHP_SUBST(LEMON_FLAGS)
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 01ea543e55..69a6e0bf17 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -204,9 +204,9 @@ if (PHP_DEBUG == "yes") {
if (PHP_ZTS == "yes") {
ADD_FLAG("CFLAGS", "/D ZTS=1");
- DEFINE("LEMON_FLAGS", "-c -q D=ZTS");
+ DEFINE("LEMON_FLAGS", "-l -q D=ZTS");
} else {
- DEFINE("LEMON_FLAGS", "-c -q");
+ DEFINE("LEMON_FLAGS", "-l -q");
}
DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");