diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 11:09:01 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 11:09:01 +0000 |
commit | 6311c5a8e40c26198e91406d9bba782796d9504f (patch) | |
tree | bf950aca7bae60a27ede6fc27838ca5bc75a09ce /cygwin | |
parent | 0a9d7d358a305ce8bcce707b06b47b88edd5fe8b (diff) |
merges r21795 from trunk into ruby_1_9_1.
* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
non-function symbols. [ruby-core:21582]
* win32/mkexports.rb (Exports::Mingw#each_export): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
-rw-r--r-- | cygwin/GNUmakefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 1da2bfc8cc..f12c46534c 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -71,7 +71,7 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG) ifeq (@target_os@,cygwin) @NM@ --extern --defined $(LIBRUBY_A) | \ $(MINIRUBY) -n -e 'BEGIN{puts "VERSION $(MAJOR).$(MINOR)","EXPORTS"}' \ - -e 'puts $$1 if / [A-Z] _((?!Init_).*)$$/' > $@ + -e 'if / (?:(T)|[A-Z]) _((?!Init_).*)$$/; puts "#{$$2}#{" DATA" if $$1}"; end' > $@ else $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) endif |