diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 11:45:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 11:45:29 +0000 |
| commit | 1b11ba706d62b8ffbd6be61e434e5c48f2097f67 (patch) | |
| tree | 44b4356ca6f2bf8560288e130ee165f9a2f80753 /configure.in | |
| parent | df445b470e9b9169c793019c51b834e186526b15 (diff) | |
common.mk: link DTRACE_OBJ
* common.mk (COMMONOBJS): include $(DTRACE_OBJ) which is necessary
for $(DTRACE_DEPENDENT_OBJS).
* configure.in (RUBY_DTRACE_POSTPROCESS): separate whether dtrace
is needed to genearate probes.o and whether it modifies input
object files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 85df4a5266..1a9a8867d4 100644 --- a/configure.in +++ b/configure.in @@ -644,10 +644,10 @@ _PROBES _CONF $CC $CFLAGS $CPPFLAGS -c -o conftest.o conftest.c && cp -p conftest.o conftest.oo && - $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null && - ! cmp -b conftest.o conftest.oo + $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null }; then rb_cv_prog_dtrace_g=yes + cmp -b conftest.o conftest.oo || rb_cv_prog_dtrace_g=rebuild else rb_cv_prog_dtrace_g=no fi @@ -3608,8 +3608,10 @@ if test "${enable_dtrace}" = "yes"; then AC_MSG_ERROR([--enable-dtrace, however, USDT is not available]) fi RUBY_DTRACE_POSTPROCESS() - if test "$rb_cv_prog_dtrace_g" = 'yes'; then + if test "$rb_cv_prog_dtrace_g" != 'no'; then DTRACE_OBJ='probes.$(OBJEXT)' + fi + if test "$rb_cv_prog_dtrace_g" = 'rebuild'; then DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)' LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)' fi |