Skip to content

Commit

Permalink
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion library/rubinius/configuration.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rubinius/build_config'
require 'core/build_config'
require 'rubinius/configuration_variables'

Rubinius::ConfigurationVariables.define do |c|
12 changes: 6 additions & 6 deletions rakelib/core.rake
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions vm/codegen/config_vars.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
$:.unshift File.expand_path("../../..", __FILE__)
$:.unshift File.expand_path("../../../library", __FILE__)

require 'rubinius/configuration'

0 comments on commit 613a7c6

Please sign in to comment.