diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-01-16 09:02:55 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-01-16 09:02:55 +0100 |
| commit | 8572aeb0703107705fc7dde35961cd6a5f89c0c8 (patch) | |
| tree | 833d2a593591ac362a7dfe90971bef61d155bfaa /acinclude.m4 | |
| parent | 0b82e05fe264306004119e30119e665365331e17 (diff) | |
| download | php-8572aeb0703107705fc7dde35961cd6a5f89c0c8.tar.gz | |
Imported Upstream version 5.5.0~alpha3upstream/5.5.0_alpha3
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ad4f7474b..aadf4c06e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2932,6 +2932,9 @@ dnl Add providerdesc.o into global objects when needed *solaris*) PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o" ;; + *linux*) + PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o" + ;; esac dnl DTrace objects @@ -2960,12 +2963,12 @@ dnl Generate Makefile.objects entries cat>>Makefile.objects<<EOF $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) - dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs EOF ]) |