[macruby-changes] [4210] MacRuby/trunk/bin/rubyc

[source_changes at macosforge.org]

Revision: 4210
          http://trac.macosforge.org/projects/ruby/changeset/4210
Author:   lsansonetti at apple.com
Date:     2010-06-05 18:26:57 -0700 (Sat, 05 Jun 2010)
Log Message:
-----------
always link using the running macruby's libdir

Modified Paths:
--------------
    MacRuby/trunk/bin/rubyc

Modified: MacRuby/trunk/bin/rubyc
===================================================================
--- MacRuby/trunk/bin/rubyc	2010-06-05 05:09:21 UTC (rev 4209)
+++ MacRuby/trunk/bin/rubyc	2010-06-06 01:26:57 UTC (rev 4210)
@@ -172,7 +172,7 @@
     # Build.
     main = gen_tmpfile('main', 'c')
     File.open(main, 'w') { |io| io.write(main_txt) }
-    linkf = @internal ? "-L. -lmacruby" : "-framework MacRuby"
+    linkf = @internal ? "-L. -lmacruby" : "-L#{RbConfig::CONFIG['libdir']} -lmacruby"
     execute("#{@gcxx} \"#{main}\" -dynamic -bundle -undefined suppress -flat_namespace #{arch_flags} #{linkf} \"#{obj}\" -o \"#{output}\"")
   end
 
@@ -197,7 +197,7 @@
     # Build.
     main = gen_tmpfile('main', 'c')
     File.open(main, 'w') { |io| io.write(main_txt) }
-    linkf = @internal ? "-L. -lmacruby" : "-framework MacRuby"
+    linkf = @internal ? "-L. -lmacruby" : "-L#{RbConfig::CONFIG['libdir']} -lmacruby"
     objs = objs_data.map { |obj, f| "\"#{obj}\"" }.join(' ') 
     execute("#{@gcxx} \"#{main}\" -dynamiclib -dynamic -undefined suppress -flat_namespace #{arch_flags} #{linkf} #{objs} -o \"#{output}\"")
   end
@@ -273,7 +273,7 @@
     # Link all objects into executable.
     linkf = @static ? 
       "-L#{RbConfig::CONFIG['libdir']} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" :
-      "-framework MacRuby -framework Foundation -lobjc -lauto"
+      "-L#{RbConfig::CONFIG['libdir']} -lmacruby -framework Foundation -lobjc -lauto"
     line = "#{@gcxx} -o \"#{output}\" #{arch_flags} #{linkf} "
     objs.each { |o| line << " \"#{o}\"" }
     execute(line)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100605/2ca44f08/attachment.html>