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

ruby-changes:23965

From: yugui <ko1@a...>
Date: Sun, 10 Jun 2012 18:39:29 +0900 (JST)
Subject: [ruby-changes:23965] yugui:r36016 (trunk): * configure.in (RUBY_NACL): Warns if $PATH does not contain the path

yugui	2012-06-10 18:39:17 +0900 (Sun, 10 Jun 2012)

  New Revision: 36016

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

  Log:
    * configure.in (RUBY_NACL): Warns if $PATH does not contain the path
      to NativeClient SDK. PATH variable redefinition in GNUmakefile does
      not work for GNU make 3.81.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 36015)
+++ configure.in	(revision 36016)
@@ -108,9 +108,17 @@
   if test -z "${NACL_TOOLCHAIN}"; then
     AC_MSG_ERROR([Unrecognized --host and --build combination or NaCl SDK is not installed])
   fi
-  PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
   AC_MSG_RESULT(${NACL_TOOLCHAIN})
 
+  AC_MSG_CHECKING([path to SDK])
+  if echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
+    AC_MSG_RESULT([set])
+  else
+    AC_MSG_RESULT([no])
+    AC_MSG_WARN([Add "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" to \$PATH])
+    PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
+  fi
+
   AC_SUBST(NACL_TOOLCHAIN)
   AC_SUBST(NACL_SDK_ROOT)
   AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36015)
+++ ChangeLog	(revision 36016)
@@ -1,3 +1,9 @@
+Sun Jun 10 18:31:42 2012  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* configure.in (RUBY_NACL): Warns if $PATH does not contain the path
+	  to NativeClient SDK. PATH variable redefinition in GNUmakefile does
+	  not work for GNU make 3.81.
+
 Sun Jun 10 17:54:36 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.h (IS_STACK_DIR_UPPER): utility macro.

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

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