diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 14:28:24 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 14:28:24 -0700 |
| commit | 8fdf1ad32d8d9a752b757f17c52757f32a462c3f (patch) | |
| tree | 3e29e68efcb54f284eb6b7464197f333112a97bd /acinclude.m4 | |
| parent | 85cc3b324014c283366e7091fb45a85cc6fb74c8 (diff) | |
| parent | b90b551228c7dcc8399030c2cb0a12c72e9440f6 (diff) | |
| download | php-git-8fdf1ad32d8d9a752b757f17c52757f32a462c3f.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fb490594d4..97037cc9d9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2962,8 +2962,12 @@ dnl DTrace objects esac dnl Generate Makefile.objects entries +dnl The empty $ac_provsrc command stops an implicit circular dependency +dnl in GNU Make which causes the .d file to be overwritten (Bug 61268) cat>>Makefile.objects<<EOF +$abs_srcdir/$ac_provsrc:; + $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ |