Skip to content

Commit 3f069b1

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fixed bug #78614 (Does not compile with DTRACE anymore)
2 parents 26baf54 + 3ded328 commit 3f069b1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/php.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@ dnl header-file.
23292329
dnl Add providerdesc.o or .lo into global objects when needed.
23302330
case $host_alias in
23312331
*freebsd*)
2332-
PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
2332+
PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
23332333
PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
23342334
;;
23352335
*solaris*)
@@ -2377,7 +2377,7 @@ $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
23772377
EOF
23782378
23792379
case $host_alias in
2380-
*solaris*|*linux*)
2380+
*solaris*|*linux*|*freebsd*)
23812381
dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
23822382
dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
23832383
dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"

0 commit comments

Comments
 (0)