[macruby-changes] [3037] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 3037
          http://trac.macosforge.org/projects/ruby/changeset/3037
Author:   lsansonetti at apple.com
Date:     2009-11-21 09:36:03 -0800 (Sat, 21 Nov 2009)
Log Message:
-----------
rubyc shouldn't use llvm-config

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

Modified: MacRuby/trunk/bin/rubyc
===================================================================
--- MacRuby/trunk/bin/rubyc	2009-11-21 17:33:49 UTC (rev 3036)
+++ MacRuby/trunk/bin/rubyc	2009-11-21 17:36:03 UTC (rev 3037)
@@ -216,13 +216,10 @@
 
     # Link all objects into executable.
     linkf = @static ? 
-      "-L#{RbConfig::CONFIG['libdir']} -lmacruby-static -framework Foundation -lobjc -lauto -lxml2" :
+      "-L#{RbConfig::CONFIG['libdir']} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" :
       "-framework MacRuby -lobjc"
     line = "#{@gcxx} -o \"#{output}\" #{archf} #{linkf} "
     @frameworks.each { |f| line << "-framework #{f} " }
-    if @static
-      line << execute("llvm-config --ldflags --libs core jit nativecodegen interpreter bitwriter").gsub(/\n/, '')
-    end
     objs.each { |o| line << " \"#{o}\"" }
     execute(line)
   end

Modified: MacRuby/trunk/rakelib/builder.rake
===================================================================
--- MacRuby/trunk/rakelib/builder.rake	2009-11-21 17:33:49 UTC (rev 3036)
+++ MacRuby/trunk/rakelib/builder.rake	2009-11-21 17:36:03 UTC (rev 3037)
@@ -219,7 +219,7 @@
   CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib"
   CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)"
   CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  #CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static #{LDFLAGS}"
+  CONFIG["LIBRUBYARG_STATIC_REALLY"] = "-l$(RUBY_SO_NAME)-static #{LDFLAGS}"
   CONFIG["LIBRUBYARG_SHARED"] = CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)"
   CONFIG["SOLIBS"] = ""
   CONFIG["DLDLIBS"] = ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20091121/9108b959/attachment.html>