Skip to content

Commit 694e044

Browse files
authored
Autotools: Sync LIBS and LDFLAGS handling (#14956)
- ZEND_EXTRA_LIBS holds all possible libraries appended during the checks related to Zend.m4, moved after the ZEND_INIT check to make it more clear, redundant double quotes removed; - EXTRA_LIBS has already been populated above in the configure.ac - redundant 'unset LIBS' removed
1 parent 6980eba commit 694e044

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

configure.ac

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,9 @@ fi
13121312

13131313
ZEND_INIT
13141314

1315+
ZEND_EXTRA_LIBS=$LIBS
1316+
unset LIBS
1317+
13151318
PHP_ADD_INCLUDE([$abs_srcdir], [1])
13161319
PHP_ADD_INCLUDE([$abs_srcdir/main], [1])
13171320
PHP_ADD_INCLUDE([$abs_builddir], [1])
@@ -1321,13 +1324,9 @@ PHP_ADD_INCLUDE([$abs_builddir/Zend])
13211324
PHP_ADD_INCLUDE([$abs_srcdir/Zend])
13221325
PHP_ADD_INCLUDE([$abs_srcdir/TSRM])
13231326

1324-
ZEND_EXTRA_LIBS="$LIBS"
1325-
unset LIBS
1326-
13271327
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
13281328
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
1329-
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
1330-
unset LIBS LDFLAGS
1329+
unset LDFLAGS
13311330

13321331
AC_ARG_PROGRAM
13331332

0 commit comments

Comments
 (0)