From 6efba755da0c9d1ff6fc53767d4770d6ca507d19 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 3 Jan 2013 15:39:15 +0000
Subject: Fix failures on btest for NativeClient. * bootstraptest/runner.rb
 (nacl?): New method to distinguish NaCl   corss build.

* bootstraptest/test_io.rb: Skip unsupported operations.

* bootstraptest/test_literal.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index af0e564fcd..f6b0b57851 100644
--- a/configure.in
+++ b/configure.in
@@ -1294,9 +1294,10 @@ $POSTLINK"
 [superux*], [	ac_cv_func_setitimer=no
 		],
 [nacl], [
-  LIBS="-lm -lnosys $LIBS"
+  LIBS="-lm $LIBS"
   if test "${nacl_cv_build_variant}" = "newlib"; then
     RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
+    RUBY_APPEND_OPTION(LIBS, '-lnosys')
   else
     RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
   fi
@@ -2707,6 +2708,10 @@ AS_CASE("$enable_shared", [yes], [
   [haiku], [
     # gcc supports PIE, but doesn't work correctly in Haiku
     pie=no
+  ],
+  [nacl], [
+    # -pie implies -shared for NaCl.
+    pie=no
   ])
   if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
     RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
-- 
cgit v1.2.3