Revision: 2758 http://trac.macosforge.org/projects/ruby/changeset/2758 Author: vincent.isambart@gmail.com Date: 2009-10-07 19:23:39 -0700 (Wed, 07 Oct 2009) Log Message: ----------- Fixed a load path and removed an improper check Modified Paths: -------------- MacRuby/trunk/spec/macruby.mspec MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/spec/macruby.mspec =================================================================== --- MacRuby/trunk/spec/macruby.mspec 2009-10-08 02:19:37 UTC (rev 2757) +++ MacRuby/trunk/spec/macruby.mspec 2009-10-08 02:23:39 UTC (rev 2758) @@ -122,7 +122,7 @@ source_root = File.expand_path('../../', __FILE__) ENV['DYLD_LIBRARY_PATH'] = source_root # Setup the proper load paths for lib and extensions - load_paths = %w{ -I./lib -I./ext } + load_paths = %w{ -I. -I./lib -I./ext } load_paths.concat Dir.glob('./ext/**/*.bundle').map { |filename| "-I#{File.dirname(filename)}" }.uniq load_paths.concat(get(:flags)) if get(:flags) set :flags, load_paths Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-08 02:19:37 UTC (rev 2757) +++ MacRuby/trunk/vm.cpp 2009-10-08 02:23:39 UTC (rev 2758) @@ -7,7 +7,7 @@ */ #define ROXOR_VM_DEBUG 0 -#define ROXOR_COMPILER_DEBUG 0 +#define ROXOR_COMPILER_DEBUG 0 #include <llvm/Module.h> #include <llvm/DerivedTypes.h> @@ -367,9 +367,13 @@ } #if ROXOR_COMPILER_DEBUG - if (verifyModule(*RoxorCompiler::module, PrintMessageAction)) { - printf("Error during module verification\n"); - exit(1); + // in AOT mode, the verifier is already called + // (and calling it here would check functions not fully compiled yet) + if (!ruby_aot_compile) { + if (verifyModule(*RoxorCompiler::module, PrintMessageAction)) { + printf("Error during module verification\n"); + exit(1); + } } uint64_t start = mach_absolute_time();