diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-01-23 13:03:16 -0800 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-01-23 13:03:16 -0800 |
| commit | 5781c639cac1f76bbf2e447c0b762bdc5107ba3a (patch) | |
| tree | 2317fd55b28c0c7930a431fbcc83e2ea993708c5 /src/ruby/tools/bin | |
| parent | 645e30a9311af1721bd8b02b533953c2c38d8263 (diff) | |
| parent | f2c5c1e541a3c42fd418063ec24bb9e591b3ad40 (diff) | |
Merge branch 'master' into pollset_set_test
Diffstat (limited to 'src/ruby/tools/bin')
| -rwxr-xr-x | src/ruby/tools/bin/grpc_tools_ruby_protoc | 4 | ||||
| -rwxr-xr-x | src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ruby/tools/bin/grpc_tools_ruby_protoc b/src/ruby/tools/bin/grpc_tools_ruby_protoc index dab06e7958..7e619e74a9 100755 --- a/src/ruby/tools/bin/grpc_tools_ruby_protoc +++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc @@ -30,7 +30,7 @@ require 'rbconfig' -require_relative '../os_check' +require_relative '../platform_check' ext = RbConfig::CONFIG['EXEEXT'] @@ -39,7 +39,7 @@ protoc_name = 'protoc' + ext plugin_name = 'grpc_ruby_plugin' + ext protoc_dir = File.join(File.dirname(__FILE__), - RbConfig::CONFIG['host_cpu'] + '-' + OS.os_name) + PLATFORM.architecture + '-' + PLATFORM.os_name) protoc_path = File.join(protoc_dir, protoc_name) diff --git a/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin index 4b296dedc7..e6af2fe365 100755 --- a/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin +++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin @@ -30,12 +30,12 @@ require 'rbconfig' -require_relative '../os_check' +require_relative '../platform_check' plugin_name = 'grpc_ruby_plugin' + RbConfig::CONFIG['EXEEXT'] plugin_path = File.join(File.dirname(__FILE__), - RbConfig::CONFIG['host_cpu'] + '-' + OS.os_name, + PLATFORM.architecture + '-' + PLATFORM.os_name, plugin_name) exec([ plugin_path, plugin_path ], *ARGV) |