Skip to content

Commit 6a54282

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Update NEWS Fix shared module generation on AIX bug #77676
2 parents 7431eb7 + fa574dd commit 6a54282

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
@@ -814,15 +814,11 @@ dnl from object_var in build-dir.
814814
dnl
815815
AC_DEFUN([PHP_SHARED_MODULE],[
816816
install_modules="install-modules"
817+
suffix=la
817818
818819
case $host_alias in
819820
*aix*[)]
820-
suffix=so
821-
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'
822-
;;
823-
*[)]
824-
suffix=la
825-
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)'
821+
additional_flags="-Wl,-G"
826822
;;
827823
esac
828824
@@ -837,7 +833,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[
837833
\$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
838834
839835
$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
840-
$link_cmd
836+
\$(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)
841837
842838
EOF
843839
])

0 commit comments

Comments
 (0)