[前][次][番号順一覧][スレッド一覧]

ruby-changes:39947

From: nobu <ko1@a...>
Date: Mon, 5 Oct 2015 00:44:03 +0900 (JST)
Subject: [ruby-changes:39947] nobu:r52028 (trunk): configure.in: add ruby-runner only if needed

nobu	2015-10-05 00:43:58 +0900 (Mon, 05 Oct 2015)

  New Revision: 52028

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52028

  Log:
    configure.in: add ruby-runner only if needed
    
    * configure.in (PREP): add ruby-runner only if needed to pass the
      environment variable for library path as /bin/sh clears it.

  Modified files:
    trunk/Makefile.in
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 52027)
+++ configure.in	(revision 52028)
@@ -3704,6 +3704,15 @@ if test "$EXEEXT" = .exe; then https://github.com/ruby/ruby/blob/trunk/configure.in#L3704
     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]),
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 52027)
+++ Makefile.in	(revision 52028)
@@ -147,7 +147,7 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L147
 
 THREAD_MODEL  = @THREAD_MODEL@
 
-PREP          = @PREP@ ruby-runner$(EXEEXT)
+PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]