Permalink
Browse files

Renamed extconfig static option to avoid ruby conflicts

--enable-static triggers Ruby's static compilation, not just ours.
  • Loading branch information...
1 parent f175491 commit 30fdb0e4d01b848387c3ddee2e05a225f7d3c5c0 @luislavena luislavena committed Apr 11, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 ext/sqlite3/extconf.rb
  2. +2 −2 tasks/native.rake
View
@@ -25,7 +25,7 @@ def asplode missing
end
end
-if enable_config("static", false)
+if enable_config("local", false)
$LDFLAGS = ENV.fetch("LDFLAGS", nil)
end
View
@@ -23,11 +23,11 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
# define target for extension (supporting fat binaries)
RUBY_VERSION =~ /(\d+\.\d+)/
ext.lib_dir = "lib/sqlite3/#{$1}"
- ext.config_options << "--enable-static"
+ ext.config_options << "--enable-local"
else
ext.cross_compile = true
ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
- ext.cross_config_options << "--enable-static"
+ ext.cross_config_options << "--enable-local"
end
end

0 comments on commit 30fdb0e

Please sign in to comment.