Skip to content

Commit f3a0047

Browse files
committed
Clean unused DEBUG_CFLAGS variable
The unused DEBUG_CFLAGS variable has been removed from Zend.m4 macros and configure.ac file. DEBUG_CFLAGS has been once set in the build files similarly to Zend.m4 but was then removed and simplified. Also, this syncs phpize.m4 debug check with configure.ac so that #78788 is fixed there as well. Related to: 0988f69
1 parent 931a8b0 commit f3a0047

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,6 @@ if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
972972
fi
973973
AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR])
974974

975-
test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
976-
977975
PHP_ARG_ENABLE([sigchild],
978976
[whether to enable PHP's own SIGCHLD handler],
979977
[AS_HELP_STRING([--enable-sigchild],
@@ -1553,7 +1551,6 @@ PHP_SUBST(CPPFLAGS)
15531551
PHP_SUBST(CXX)
15541552
PHP_SUBST(CXXFLAGS)
15551553
PHP_SUBST(CXXFLAGS_CLEAN)
1556-
PHP_SUBST_OLD(DEBUG_CFLAGS)
15571554
PHP_SUBST_OLD(EXTENSION_DIR)
15581555
PHP_SUBST_OLD(EXTRA_LDFLAGS)
15591556
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)

scripts/phpize.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ if test "$PHP_DEBUG" = "yes"; then
116116
PHP_DEBUG=1
117117
ZEND_DEBUG=yes
118118
changequote({,})
119-
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
120-
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
119+
CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
120+
CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
121121
changequote([,])
122122
dnl Add -O0 only if GCC or ICC is used.
123123
if test "$GCC" = "yes" || test "$ICC" = "yes"; then

0 commit comments

Comments
 (0)