changeset 3240:5d8d64f95c49

Updated ruby version check and swapped libs in lddflags
author unexist
date Mon, 25 Mar 2013 17:18:45 +0100
parents 6670ea4caf96
children 71c757f2a3c4
files Rakefile
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Rakefile	Wed Jan 02 18:29:51 2013 +0100
+++ b/Rakefile	Mon Mar 25 17:18:45 2013 +0100
@@ -65,7 +65,7 @@
   "revision"   => "3224", #< Latest stable
   "cflags"     => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
   "cpppath"    => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)",
-  "ldflags"    => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+  "ldflags"    => "$(rpath) -L$(libdir) $(LIBS) -l$(RUBY_SO_NAME)",
   "extflags"   => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
   "rpath"      => "-L$(libdir) -Wl,-rpath=$(libdir)",
   "checksums"  => []
@@ -258,7 +258,7 @@
     make_config unless checksums
   else
     # Check version
-    if 1 != RbConfig::CONFIG["MAJOR"].to_i or 9 != RbConfig::CONFIG["MINOR"].to_i
+    if 1 == RbConfig::CONFIG["MAJOR"].to_i and 9 > RbConfig::CONFIG["MINOR"].to_i
       fail("Ruby 1.9.0 or higher required")
     end