diff options
| author |  temiola <temiola@google.com> | 2015-01-06 17:51:48 -0800 |
|---|---|---|
| committer |  Nicolas Noble <nnoble@google.com> | 2015-01-06 18:17:57 -0800 |
| commit | f8b66eab6ac1400d5f310b52e954010e943589af (patch) | |
| tree | a7e30d5a4dbd3595130c392c7cfb8355e8c97f43 /src | |
| parent | 54535552559beae3465a92b2f5ed53e9636d45aa (diff) | |
Updates extconf.rb to use grpc from the make install locations
Change on 2015/01/06 by temiola <temiola@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83391947
Diffstat (limited to 'src')
| -rw-r--r-- | src/ruby/ext/grpc/extconf.rb | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index 9a181f5859..a828b47294 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -33,37 +33,25 @@ LIBDIR = RbConfig::CONFIG['libdir'] INCLUDEDIR = RbConfig::CONFIG['includedir'] HEADER_DIRS = [ - # First search the local development dir - ENV['HOME'] + '/grpc_dev/include', - - # Then search /opt/local (Mac) + # Search /opt/local (Mac source install) '/opt/local/include', - # Then search /usr/local (Source install) + # Search /usr/local (Source install) '/usr/local/include', # Check the ruby install locations INCLUDEDIR, - - # Finally fall back to /usr - '/usr/include' ] LIB_DIRS = [ - # First search the local development dir - ENV['HOME'] + '/grpc_dev/lib', - - # Then search /opt/local for (Mac) + # Search /opt/local (Mac source install) '/opt/local/lib', - # Then search /usr/local (Source install) + # Search /usr/local (Source install) '/usr/local/lib', # Check the ruby install locations LIBDIR, - - # Finally fall back to /usr - '/usr/lib' ] def crash(msg) @@ -80,9 +68,7 @@ $CFLAGS << ' -Wno-return-type ' $CFLAGS << ' -Wall ' $CFLAGS << ' -pedantic ' -$LDFLAGS << ' -lgrpc -lgpr -levent -levent_pthreads -levent_core ' -$LDFLAGS << ' -lssl -lcrypto ' -$DLDFLAGS << ' -Wl,-rpath,/usr/local/ssl/lib ' +$LDFLAGS << ' -lgrpc -lgpr -levent -levent_pthreads -levent_core' # crash('need grpc lib') unless have_library('grpc', 'grpc_channel_destroy') # |