Skip to content
Snippets Groups Projects
Commit f8b66eab authored by temiola's avatar temiola Committed by Nicolas Noble
Browse files

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
parent 54535552
No related branches found
No related tags found
No related merge requests found
...@@ -33,37 +33,25 @@ LIBDIR = RbConfig::CONFIG['libdir'] ...@@ -33,37 +33,25 @@ LIBDIR = RbConfig::CONFIG['libdir']
INCLUDEDIR = RbConfig::CONFIG['includedir'] INCLUDEDIR = RbConfig::CONFIG['includedir']
HEADER_DIRS = [ HEADER_DIRS = [
# First search the local development dir # Search /opt/local (Mac source install)
ENV['HOME'] + '/grpc_dev/include',
# Then search /opt/local (Mac)
'/opt/local/include', '/opt/local/include',
# Then search /usr/local (Source install) # Search /usr/local (Source install)
'/usr/local/include', '/usr/local/include',
# Check the ruby install locations # Check the ruby install locations
INCLUDEDIR, INCLUDEDIR,
# Finally fall back to /usr
'/usr/include'
] ]
LIB_DIRS = [ LIB_DIRS = [
# First search the local development dir # Search /opt/local (Mac source install)
ENV['HOME'] + '/grpc_dev/lib',
# Then search /opt/local for (Mac)
'/opt/local/lib', '/opt/local/lib',
# Then search /usr/local (Source install) # Search /usr/local (Source install)
'/usr/local/lib', '/usr/local/lib',
# Check the ruby install locations # Check the ruby install locations
LIBDIR, LIBDIR,
# Finally fall back to /usr
'/usr/lib'
] ]
def crash(msg) def crash(msg)
...@@ -80,9 +68,7 @@ $CFLAGS << ' -Wno-return-type ' ...@@ -80,9 +68,7 @@ $CFLAGS << ' -Wno-return-type '
$CFLAGS << ' -Wall ' $CFLAGS << ' -Wall '
$CFLAGS << ' -pedantic ' $CFLAGS << ' -pedantic '
$LDFLAGS << ' -lgrpc -lgpr -levent -levent_pthreads -levent_core ' $LDFLAGS << ' -lgrpc -lgpr -levent -levent_pthreads -levent_core'
$LDFLAGS << ' -lssl -lcrypto '
$DLDFLAGS << ' -Wl,-rpath,/usr/local/ssl/lib '
# crash('need grpc lib') unless have_library('grpc', 'grpc_channel_destroy') # crash('need grpc lib') unless have_library('grpc', 'grpc_channel_destroy')
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment