[macruby-changes] [1534] MacRuby/branches/experimental

source_changes at macosforge.org source_changes at macosforge.org
Mon May 4 21:35:36 PDT 2009


Revision: 1534
          http://trac.macosforge.org/projects/ruby/changeset/1534
Author:   lsansonetti at apple.com
Date:     2009-05-04 21:35:36 -0700 (Mon, 04 May 2009)
Log Message:
-----------
bye bye libffi (yay)

Modified Paths:
--------------
    MacRuby/branches/experimental/include/ruby/defines.h
    MacRuby/branches/experimental/rakelib/builder.rb

Modified: MacRuby/branches/experimental/include/ruby/defines.h
===================================================================
--- MacRuby/branches/experimental/include/ruby/defines.h	2009-05-05 04:18:11 UTC (rev 1533)
+++ MacRuby/branches/experimental/include/ruby/defines.h	2009-05-05 04:35:36 UTC (rev 1534)
@@ -286,11 +286,6 @@
 # include <objc/message.h>
 # include <objc/objc-auto.h>
 # include <assert.h>
-# if !defined(MACOSX)
-   /* required for fficonfig.h */
-#  define MACOSX
-# endif
-# include <ffi/ffi.h>
 # include <CoreFoundation/CoreFoundation.h>
 # define ASSERT_NO_OBJC() (assert(1 == 0))
 void rb_objc_wb(void *dst, void *newval);

Modified: MacRuby/branches/experimental/rakelib/builder.rb
===================================================================
--- MacRuby/branches/experimental/rakelib/builder.rb	2009-05-05 04:18:11 UTC (rev 1533)
+++ MacRuby/branches/experimental/rakelib/builder.rb	2009-05-05 04:35:36 UTC (rev 1534)
@@ -91,7 +91,7 @@
 CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}"
 CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD
 LDFLAGS = `#{LLVM_CONFIG} --ldflags --libs #{LLVM_MODULES}`.strip.gsub(/\n/, '')
-LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lffi -lauto -framework Foundation"
+LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -framework Foundation"
 DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}"
 
 # removed: marshal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090504/d5cd095f/attachment.html>


More information about the macruby-changes mailing list