Merge branch 'daedalus'

Conflicts: rakelib/vm.rake
rubinius · Feb 23, 2011 · 56da88c · 56da88c
2 parents dcf20b8 + 1ec8099
commit 56da88c
Show file tree

Hide file tree

Showing 9 changed files with 1,410 additions and 458 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 !spec/tags
+artifacts/
 *.a
 *.bundle
 *.dSYM

diff --git a/Rakefile b/Rakefile
@@ -101,7 +101,7 @@ end
 
 # See vm.rake for more information
 desc "Build everything that needs to be built at default level."
-task :build => ["build:normal", "gem_bootstrap"]
+task :build => ["build:build", "gem_bootstrap"]
 
 desc "Recompile all ruby system files"
 task :rebuild => %w[clean build]