diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:13:20 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:13:20 +0000 |
commit | e62660c9208ff1da2bbe5b72197f74e9c1cdf4da (patch) | |
tree | 29e707399ac976293539946f42c074c8d2d1ba48 /configure.in | |
parent | 7c83af2d7be6ae3dd0d7dfa464b6711951e5312e (diff) |
merge revision(s) 41815,41816: [Backport #8606]
* configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11
introduces a check in the dtrace compiler to ensure that probes
actually exist. If there are no probes, then the -G step will
fail. As this test is only being used to determine whether -G is
necessary (for instance, on OSX it is not), adding a real probe to
the conftest allows it to succeed on newer versions of dtrace.
Patch by Eric Saxby <sax AT livinginthepast.org> at
[ruby-core:55826]. [Fix GH-351], [Bug #8606].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 7977aaf359..381dfd3ae4 100644 --- a/configure.in +++ b/configure.in @@ -530,15 +530,21 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], AC_DEFUN([RUBY_DTRACE_POSTPROCESS], [AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g, [ - echo "int main(void){ return 0; }" > conftest.c - echo "provider conftest{};" > conftest_provider.d - $CC $CFLAGS -c -o conftest.o conftest.c - if $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null; then - rb_cv_prog_dtrace_g=yes - else - rb_cv_prog_dtrace_g=no - fi - rm -f conftest.o conftest.c conftest_provider.d conftest_provider.o + if { + echo "provider conftest{ probe fire(); };" > conftest_provider.d && + dtrace -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null && + cat >conftest.c <<_CONF && + @%:@include "conftest_provider.h" + int main(void){ CONFTEST_FIRE(); return 0; } +_CONF + $CC $CFLAGS -c -o conftest.o conftest.c && + $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null + }; then + rb_cv_prog_dtrace_g=yes + else + rb_cv_prog_dtrace_g=no + fi + rm -f conftest.[co] conftest_provider.[dho] ]) ]) |