diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 20:53:16 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 20:53:16 +0000 |
| commit | 476af221b70d4698acadff0e4f379f637579237b (patch) | |
| tree | 50ee5f70939b0ab98fc0a0862cea3e0c561cde3a | |
| parent | a6727897392003115d2173baa152cd23eaf1ced6 (diff) | |
* nacl/nacl-config.rb: Use File.exist? instead of executable?
for irt_core. Recent nacl_sdk has non-executable irt_core.
Patch by Shinichiro Hamaji.
[Fixes GH-529] https://github.com/ruby/ruby/pull/529
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | nacl/nacl-config.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Tue Jun 24 05:40:41 2014 KOSAKI Motohiro <[email protected]> + + * nacl/nacl-config.rb: Use File.exist? instead of executable? + for irt_core. Recent nacl_sdk has non-executable irt_core. + Patch by Shinichiro Hamaji. + [Fixes GH-529] https://github.com/ruby/ruby/pull/529 + Tue Jun 24 03:52:35 2014 NARUSE, Yui <[email protected]> * lib/uri/mailto.rb: support RFC6068. diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb index b90c9ed100..2da05c0847 100644..100755 --- a/nacl/nacl-config.rb +++ b/nacl/nacl-config.rb @@ -34,7 +34,7 @@ module NaClConfig IRT_CORE = [ File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "irt_core_#{cpu_nick}.nexe"), File.join(SDK_ROOT, 'tools', "irt_core_#{cpu_nick}.nexe") - ].find{|path| File.executable?(path)} or raise "No irt_core found" + ].find{|path| File.exist?(path)} or raise "No irt_core found" RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so') module_function |