Fixed paths and cleaned up var warnings.

rubinius · Feb 4, 2016 · 613a7c6 · 613a7c6
1 parent 883aa40
commit 613a7c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/library/rubinius/configuration.rb b/library/rubinius/configuration.rb
@@ -1,4 +1,4 @@
-require 'rubinius/build_config'
+require 'core/build_config'
 require 'rubinius/configuration_variables'
 
 Rubinius::ConfigurationVariables.define do |c|

diff --git a/rakelib/core.rake b/rakelib/core.rake
@@ -241,10 +241,10 @@ file "runtime/core/data" => ["runtime/core", core_load_order] + runtime_files do
   while x = code_db_code.shift
     id, cc = x
 
-    cc.literals.each_with_index do |x, index|
-      if x.kind_of? Rubinius::CompiledCode
+    cc.literals.each_with_index do |lit, index|
+      if lit.kind_of? Rubinius::CompiledCode
         cc.literals[index] = i = CodeDBCompiler.m_id
-        code_db_code.unshift [i, x]
+        code_db_code.unshift [i, lit]
       end
     end
 
@@ -254,11 +254,11 @@ file "runtime/core/data" => ["runtime/core", core_load_order] + runtime_files do
   end
 
   File.open t.name, "wb" do |f|
-    code_db_data.map! do |id, marshaled|
+    code_db_data.map! do |m_id, data|
       offset = f.pos
-      f.write marshaled
+      f.write data
 
-      [id, offset, f.pos - offset]
+      [m_id, offset, f.pos - offset]
     end
   end
 end

diff --git a/vm/codegen/config_vars.rb b/vm/codegen/config_vars.rb
@@ -1,3 +1,4 @@
+$:.unshift File.expand_path("../../..", __FILE__)
 $:.unshift File.expand_path("../../../library", __FILE__)
 
 require 'rubinius/configuration'