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

[source_changes at macosforge.org]

Revision: 4231
          http://trac.macosforge.org/projects/ruby/changeset/4231
Author:   lsansonetti at apple.com
Date:     2010-06-16 15:42:18 -0700 (Wed, 16 Jun 2010)
Log Message:
-----------
generating executables now honors the --internal flag

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

Modified: MacRuby/trunk/bin/rubyc
===================================================================
--- MacRuby/trunk/bin/rubyc	2010-06-16 22:41:50 UTC (rev 4230)
+++ MacRuby/trunk/bin/rubyc	2010-06-16 22:42:18 UTC (rev 4231)
@@ -281,9 +281,10 @@
     objs.unshift(main_o)
 
     # Link all objects into executable.
+    path = @internal ? "-L." : "-L#{RbConfig::CONFIG['libdir']}"
     linkf = @static ? 
-      "-L#{RbConfig::CONFIG['libdir']} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" :
-      "-L#{RbConfig::CONFIG['libdir']} -lmacruby -framework Foundation -lobjc -lauto"
+      "#{path} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" :
+      "#{path} -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/20100616/759a7f41/attachment-0001.html>