[macruby-changes] [2608] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 2608
          http://trac.macosforge.org/projects/ruby/changeset/2608
Author:   lsansonetti at apple.com
Date:     2009-09-22 11:25:48 -0700 (Tue, 22 Sep 2009)
Log Message:
-----------
fix build

Modified Paths:
--------------
    MacRuby/trunk/bin/rubyc
    MacRuby/trunk/rakelib/builder.rake

Modified: MacRuby/trunk/bin/rubyc
===================================================================
--- MacRuby/trunk/bin/rubyc	2009-09-22 09:52:15 UTC (rev 2607)
+++ MacRuby/trunk/bin/rubyc	2009-09-22 18:25:48 UTC (rev 2608)
@@ -135,7 +135,8 @@
 
     main = gen_tmpfile('main', 'c')
     File.open(main, 'w') { |io| io.write(main_txt) }
-    execute("#{@gcxx} #{main} -dynamic -bundle -undefined suppress -flat_namespace -arch x86_64 -framework MacRuby #{obj} -o #{output}")
+    link = @internal ? "-L. -lmacruby" : "-framework MacRuby"
+    execute("#{@gcxx} #{main} -dynamic -bundle -undefined suppress -flat_namespace -arch x86_64 #{link} #{obj} -o #{output}")
   end
 
   def compile_executable(objs, output)

Modified: MacRuby/trunk/rakelib/builder.rake
===================================================================
--- MacRuby/trunk/rakelib/builder.rake	2009-09-22 09:52:15 UTC (rev 2607)
+++ MacRuby/trunk/rakelib/builder.rake	2009-09-22 18:25:48 UTC (rev 2608)
@@ -348,7 +348,7 @@
 
 AOT_STDLIB = ['rbconfig.rb', 'lib/irb.rb', 'lib/irb/**/*.rb', 'lib/fileutils.rb']
 desc "AOT compile parts of the stdlib"
-task :aot_compile_stdlib => [:miniruby] do
+task :aot_compile_stdlib => [:miniruby, 'macruby:dylib'] do
   AOT_STDLIB.each do |pat|
     Dir.glob(pat).each do |path|
       out = File.join(File.dirname(path), File.basename(path, '.rb') + '.rbo')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090922/0e72f891/attachment.html>