[macruby-changes] [2065] MacRuby/branches/experimental/rakelib/builder.rake

[source_changes at macosforge.org]

Revision: 2065
          http://trac.macosforge.org/projects/ruby/changeset/2065
Author:   lsansonetti at apple.com
Date:     2009-07-23 21:56:10 -0700 (Thu, 23 Jul 2009)
Log Message:
-----------
fixed rbconfig.rb to never mention libmacruby-static, reverted TRY_LINK

Modified Paths:
--------------
    MacRuby/branches/experimental/rakelib/builder.rake

Modified: MacRuby/branches/experimental/rakelib/builder.rake
===================================================================
--- MacRuby/branches/experimental/rakelib/builder.rake	2009-07-24 04:55:08 UTC (rev 2064)
+++ MacRuby/branches/experimental/rakelib/builder.rake	2009-07-24 04:56:10 UTC (rev 2065)
@@ -183,7 +183,7 @@
   CONFIG["LIBPATHFLAG"] = " -L%s"
   CONFIG["RPATHFLAG"] = ""
   CONFIG["LIBPATHENV"] = "DYLD_LIBRARY_PATH"
-  CONFIG["TRY_LINK"] = "$(CXX) -o conftest $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+  CONFIG["TRY_LINK"] = ""
   CONFIG["STRIP"] = "strip -A -n"
   CONFIG["EXTSTATIC"] = ""
   CONFIG["setup"] = "Setup"
@@ -205,8 +205,8 @@
   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_SHARED"] = "-l$(RUBY_SO_NAME)"
+  #CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static #{LDFLAGS}"
+  CONFIG["LIBRUBYARG_SHARED"] = CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)"
   CONFIG["SOLIBS"] = ""
   CONFIG["DLDLIBS"] = ""
   CONFIG["ENABLE_SHARED"] = "yes"
@@ -318,6 +318,7 @@
     Dir.glob(File.join(ext_dir, '**/extconf.rb')) do |p|
       dir = File.dirname(p)
       Dir.chdir(dir) do
+        $stderr.puts "cd #{dir}"
         srcdir = File.join(*dir.split(File::SEPARATOR).map { |x| '..' })
         if !File.exist?('Makefile') or File.mtime('extconf.rb') > File.mtime('Makefile')
           sh "#{srcdir}/miniruby -I#{srcdir} -I#{srcdir}/lib extconf.rb"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090723/cd897891/attachment.html>