diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-05-05 23:33:38 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-05-05 23:33:38 -0700 |
| commit | 4106b309867adc08936c6a901561aff3c8cd40ee (patch) | |
| tree | 8570318e3c5485ecaabeea93518679692433a329 /ext | |
| parent | d2de4557234ddf3dd11e658109c0c224f25fe4e3 (diff) | |
| download | ffi-yajl-4106b309867adc08936c6a901561aff3c8cd40ee.tar.gz | |
use the libyajl2 gem
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/ffi_yajl/ext/encoder/extconf.rb | 9 | ||||
| -rw-r--r-- | ext/ffi_yajl/ext/parser/extconf.rb | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb index 40f16ad..55add56 100644 --- a/ext/ffi_yajl/ext/encoder/extconf.rb +++ b/ext/ffi_yajl/ext/encoder/extconf.rb @@ -1,16 +1,15 @@ require 'mkmf' +require 'libyajl2' # the customer is always right, ruby is always compiled to be stupid $CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS'] $LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS'] RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] -# search our gem root first to pick up libyajl2 that we vendored -gem_root = File.expand_path(File.join(File.dirname(__FILE__), "../../../..")) -$CFLAGS = "-I#{gem_root}/include -L#{gem_root}/lib #{$CFLAGS}" -$LDFLAGS = "-L#{gem_root}/lib #{$CFLAGS}" +# pick up the vendored libyajl2 out of the libyajl2 gem +$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}" +$LDFLAGS = "-L#{Libyajl2.opt_path} #{$CFLAGS}" -puts gem_root puts $CFLAGS puts $LDFLAGS diff --git a/ext/ffi_yajl/ext/parser/extconf.rb b/ext/ffi_yajl/ext/parser/extconf.rb index e78e7a2..1720e27 100644 --- a/ext/ffi_yajl/ext/parser/extconf.rb +++ b/ext/ffi_yajl/ext/parser/extconf.rb @@ -1,16 +1,15 @@ require 'mkmf' +require 'libyajl2' # the customer is always right, ruby is always compiled to be stupid $CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS'] $LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS'] RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] -# search our gem root first to pick up libyajl2 that we vendored -gem_root = File.expand_path(File.join(File.dirname(__FILE__), "../../../..")) -$CFLAGS = "-I#{gem_root}/include -L#{gem_root}/lib #{$CFLAGS}" -$LDFLAGS = "-L#{gem_root}/lib #{$CFLAGS}" +# pick up the vendored libyajl2 out of the libyajl2 gem +$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}" +$LDFLAGS = "-L#{Libyajl2.opt_path} #{$CFLAGS}" -puts gem_root puts $CFLAGS puts $LDFLAGS |