diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-30 18:35:13 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-30 18:35:13 +0100 |
| commit | b8e9e9c8463118e0996a120489ae8d9a4bd42969 (patch) | |
| tree | 71dafc1417ce134bad67591b2a0427cca62871e6 /src/ruby/ext | |
| parent | 09121799b0bfa57d4076ec2661d99f5c3b185ef2 (diff) | |
Fixing the Ruby build after all these merges.
Diffstat (limited to 'src/ruby/ext')
| -rw-r--r-- | src/ruby/ext/grpc/extconf.rb | 3 | ||||
| -rw-r--r-- | src/ruby/ext/grpc/rb_grpc_imports.generated.c | 2 | ||||
| -rw-r--r-- | src/ruby/ext/grpc/rb_grpc_imports.generated.h | 42 |
3 files changed, 23 insertions, 24 deletions
diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index 52c512e015..84ee3f8364 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -90,13 +90,12 @@ unless File.exist?(File.join(grpc_lib_dir, 'libgrpc.a')) ENV['BUILDDIR'] = output_dir puts 'Building internal gRPC into ' + grpc_lib_dir - system("make -j -C #{grpc_root} #{grpc_lib_dir}/libgpr.a #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config}") + system("make -j -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config}") exit 1 unless $? == 0 end $CFLAGS << ' -I' + File.join(grpc_root, 'include') $LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') -$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgpr.a') if grpc_config == 'gcov' $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic' diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c index fe04ee6a5d..879154dbc3 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c @@ -35,7 +35,7 @@ #ifdef GPR_WIN32 -#include "rb_grpc_imports.h" +#include "rb_grpc_imports.generated.h" census_initialize_type census_initialize_import; census_shutdown_type census_shutdown_import; diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index f7b851d398..7714cd87f2 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -40,27 +40,27 @@ #include <windows.h> -#include <include/grpc/census.h> -#include <include/grpc/compression.h> -#include <include/grpc/grpc.h> -#include <include/grpc/grpc_security.h> -#include <include/grpc/grpc_zookeeper.h> -#include <include/grpc/impl/codegen/alloc.h> -#include <include/grpc/impl/codegen/byte_buffer.h> -#include <include/grpc/impl/codegen/log.h> -#include <include/grpc/impl/codegen/slice.h> -#include <include/grpc/impl/codegen/slice_buffer.h> -#include <include/grpc/impl/codegen/sync.h> -#include <include/grpc/impl/codegen/time.h> -#include <include/grpc/support/avl.h> -#include <include/grpc/support/cmdline.h> -#include <include/grpc/support/cpu.h> -#include <include/grpc/support/histogram.h> -#include <include/grpc/support/host_port.h> -#include <include/grpc/support/log_win32.h> -#include <include/grpc/support/string_util.h> -#include <include/grpc/support/subprocess.h> -#include <include/grpc/support/thd.h> +#include <grpc/census.h> +#include <grpc/compression.h> +#include <grpc/grpc.h> +#include <grpc/grpc_security.h> +#include <grpc/grpc_zookeeper.h> +#include <grpc/impl/codegen/alloc.h> +#include <grpc/impl/codegen/byte_buffer.h> +#include <grpc/impl/codegen/log.h> +#include <grpc/impl/codegen/slice.h> +#include <grpc/impl/codegen/slice_buffer.h> +#include <grpc/impl/codegen/sync.h> +#include <grpc/impl/codegen/time.h> +#include <grpc/support/avl.h> +#include <grpc/support/cmdline.h> +#include <grpc/support/cpu.h> +#include <grpc/support/histogram.h> +#include <grpc/support/host_port.h> +#include <grpc/support/log_win32.h> +#include <grpc/support/string_util.h> +#include <grpc/support/subprocess.h> +#include <grpc/support/thd.h> typedef int(*census_initialize_type)(int features); extern census_initialize_type census_initialize_import; |