Simplify mkmf.rb.

There is no need to check for CAPI version in mkmf.rb, since Rubinius already loaded mkmf.rb from version dependent location.
rubinius · Jun 29, 2012 · ebad23a · ebad23a
1 parent d26abd0
commit ebad23a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/lib/18/mkmf.rb b/lib/18/mkmf.rb
@@ -132,11 +132,7 @@ def map_dir(dir, map = nil)
 
 # ---------------------- Changed for Rubinius --------------------------------
 if dir = ENV['RBX_CAPI_DIR']
-  if Rubinius.ruby18?
-    $topdir = "#{dir}/vm/capi/18/include"
-  else
-    $topdir = "#{dir}/vm/capi/19/include"
-  end
+  $topdir = "#{dir}/vm/capi/18/include"
 else
   $topdir = RbConfig::CONFIG["rubyhdrdir"]
 end

diff --git a/lib/19/mkmf.rb b/lib/19/mkmf.rb
@@ -156,11 +156,7 @@ def map_dir(dir, map = nil)
 
 # ---------------------- Changed for Rubinius --------------------------------
 if dir = ENV['RBX_CAPI_DIR']
-  if Rubinius.ruby18?
-    $topdir = "#{dir}/vm/capi/18/include"
-  else
-    $topdir = "#{dir}/vm/capi/19/include"
-  end
+  $topdir = "#{dir}/vm/capi/19/include"
 else
   $topdir = RbConfig::CONFIG["rubyhdrdir"]
 end