yugui	2014-10-11 12:35:18 +0900 (Sat, 11 Oct 2014)

  New Revision: 47875

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

  Log:
    Support build for Portable Native Client outside of naclports tree.
    
    * configure.in (RUBY_NACL): automatically locate pnacl-clang.
      (RUBY_PLATFORM): pnacl instead of le32-nacl.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 47874)
+++ configure.in	(revision 47875)
@@ -111,7 +111,10 @@ AC_DEFUN([RUBY_NACL], https://github.com/ruby/ruby/blob/trunk/configure.in#L111
   ac_tool_prefix="$host_cpu-nacl-"
 
   AC_MSG_CHECKING([NativeClient toolchain])
-  if test -d \
+  if test x"$nacl_cv_cpu_nick" = xpnacl; then
+    NACL_TOOLCHAIN="${nacl_cv_os_nick}_pnacl"
+    ac_tool_prefix=pnacl-
+  elif test -d \
     "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
     NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
   elif test -d \
@@ -144,10 +147,12 @@ AC_DEFUN([RUBY_NACL], https://github.com/ruby/ruby/blob/trunk/configure.in#L147
   if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
     PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
   fi
+  AC_MSG_RESULT(${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin)
 
   AC_SUBST(NACL_TOOLCHAIN)
   AC_SUBST(NACL_SDK_ROOT)
   AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
+  AC_CHECK_TOOLS(CC, [clang gcc])
 ])])
 
 AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
@@ -4024,7 +4029,8 @@ if test "${universal_binary-no}" = yes ; https://github.com/ruby/ruby/blob/trunk/configure.in#L4029
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
 else
     arch="${target_cpu}-${target_os}"
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
+    AS_CASE(["$arch"], [le32-nacl], [arch="pnacl"])
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")]
 fi
 
 unset sitearch
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47874)
+++ ChangeLog	(revision 47875)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 11 12:27:03 2014  Yuki Yugui Sonoda  <yugui@y...>
+
+	* configure.in (RUBY_NACL): automatically locate pnacl-clang.
+	  (RUBY_PLATFORM): pnacl instead of le32-nacl.
+
 Sat Oct 11 11:27:14 2014  Yuki Yugui Sonoda  <yugui@y...>
 
 	* io.c: fix issues in the last two commits. don't disable cloexec for

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