From 384c6fc88e02314bb628f817ec2b51f4c6ffcb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 14 Nov 2011 14:06:58 +0100 Subject: tasks/constants use RBConfig instead of deprecated Config --- tasks/constants.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/constants.rb b/tasks/constants.rb index 78a7625..045ed42 100644 --- a/tasks/constants.rb +++ b/tasks/constants.rb @@ -27,19 +27,19 @@ if USE_RAKE_COMPILER ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2' end -LIBEXT = case Config::CONFIG['host_os'].downcase +LIBEXT = case RBConfig::CONFIG['host_os'].downcase when /darwin/ "dylib" when /mswin|mingw/ "dll" else - Config::CONFIG['DLEXT'] + RBConfig::CONFIG['DLEXT'] end -CPU = case Config::CONFIG['host_cpu'].downcase +CPU = case RBConfig::CONFIG['host_cpu'].downcase when /i[3456]86/ # Darwin always reports i686, even when running in 64bit mode - if Config::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum) + if RBConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum) "x86_64" else "i386" @@ -51,10 +51,10 @@ CPU = case Config::CONFIG['host_cpu'].downcase when /ppc|powerpc/ "powerpc" else - Config::CONFIG['host_cpu'] + RBConfig::CONFIG['host_cpu'] end -OS = case Config::CONFIG['host_os'].downcase +OS = case RBConfig::CONFIG['host_os'].downcase when /linux/ "linux" when /darwin/ @@ -68,12 +68,12 @@ OS = case Config::CONFIG['host_os'].downcase when /mswin|mingw/ "win32" else - Config::CONFIG['host_os'].downcase + RBConfig::CONFIG['host_os'].downcase end -CC=ENV['CC'] || Config::CONFIG['CC'] || "gcc" +CC=ENV['CC'] || RBConfig::CONFIG['CC'] || "gcc" -GMAKE = Config::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make" +GMAKE = RBConfig::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make" DIFF = if WIN32 then 'diff.exe' -- cgit v1.1-2-g2b99