Skip to content

Commit fa574dd

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Update NEWS Fix shared module generation on AIX bug #77676
2 parents c2fb855 + 637713c commit fa574dd

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

acinclude.m4

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -833,15 +833,11 @@ dnl from object_var in build-dir.
833833
dnl
834834
AC_DEFUN([PHP_SHARED_MODULE],[
835835
install_modules="install-modules"
836+
suffix=la
836837
837838
case $host_alias in
838839
*aix*[)]
839-
suffix=so
840-
link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so'
841-
;;
842-
*[)]
843-
suffix=la
844-
link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
840+
additional_flags="-Wl,-G"
845841
;;
846842
esac
847843
@@ -856,7 +852,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[
856852
\$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
857853
858854
$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
859-
$link_cmd
855+
\$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
860856
861857
EOF
862858
])

0 commit comments

Comments
 (0)