Skip to content

Commit

Permalink
configure.in: add ruby-runner only if needed
Browse files Browse the repository at this point in the history
* configure.in (PREP): add ruby-runner only if needed to pass the
  environment variable for library path as /bin/sh clears it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Oct 4, 2015
1 parent 8595d30 commit b1a7ef9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \

THREAD_MODEL = @THREAD_MODEL@

PREP = @PREP@ ruby-runner$(EXEEXT)
PREP = @PREP@
ARCHFILE = @ARCHFILE@
SETUP =
EXTSTATIC = @EXTSTATIC@
Expand Down
9 changes: 9 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -3704,6 +3704,15 @@ if test "$EXEEXT" = .exe; then
AC_SUBST(EXECUTABLE_EXTS)
fi

AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [
AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
[AC_MSG_RESULT(no)],
[PREP="$PREP"' ruby-runner$(EXEEXT)'
AC_MSG_RESULT(yes)]
)
])

AC_ARG_ENABLE(dtrace,
AS_HELP_STRING([--enable-dtrace],
[enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
Expand Down

0 comments on commit b1a7ef9

Please sign in to comment.