diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 23 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sat May 27 11:29:46 2006 nobuyoshi nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake): remove extinit files if no statically linked + extensions. + Fri May 26 09:05:11 2006 nobuyoshi nakada <nobu@ruby-lang.org> * ruby.h, lib/mkmf.rb (create_header): clear command line options for diff --git a/ext/extmk.rb b/ext/extmk.rb index 7066485571..ade62c31d2 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -70,7 +70,7 @@ def extract_makefile(makefile, keep = true) end $target = target $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1] - $static = m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false + $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "") @@ -92,7 +92,6 @@ def extmake(target) else $static = false end - $default_static = $static unless $ignore return true if $nodynamic and not $static @@ -131,7 +130,6 @@ def extmake(target) !(t = modified?(makefile, MTIMES)) || %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb #{$srcdir}/depend".any? {|f| modified?(f, [t])}) then - $default_static = $static ok = false init_mkmf Logging::logfile 'mkmf.log' @@ -404,8 +402,13 @@ end $hdrdir = $top_srcdir = srcdir $topdir = "." +extinit = Struct.new(:c, :o) { + def initialize(src) + super("#{src}.c", "#{src}.#{$OBJEXT}") + end +}.new("extinit") if $ignore - FileUtils.rm_f(%W"extinit.c extinit.#{$OBJEXT}") if $clean + FileUtils.rm_f(extinit.to_a) if $clean Dir.chdir ".." if $clean Dir.rmdir('ext') rescue nil @@ -436,16 +439,16 @@ if $extlist.size > 0 end end - src = <<SRC + src = %{\ extern char *ruby_sourcefile, *rb_source_filename(); #define init(func, name) (ruby_sourcefile = src = rb_source_filename(name), func(), rb_provide(src)) void Init_ext() {\n\tchar* src;\n#$extinit} -SRC - if !modified?("extinit.c", MTIMES) || IO.read("extinit.c") != src - open("extinit.c", "w") {|f| f.print src} +} + if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src + open(extinit.c, "w") {|f| f.print src} end - $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs + $extobjs = "ext/#{extinit.o} " + $extobjs if RUBY_PLATFORM =~ /m68k-human|beos/ $extflags.delete("-L/usr/local/lib") end @@ -461,6 +464,8 @@ SRC puts conf $stdout.flush $mflags.concat(conf) +else + FileUtils.rm_f(extinit.to_a) end rubies = [] %w[RUBY RUBYW STATIC_RUBY].each {|r| diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 26c40ed58e..b5a16e908e 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1101,7 +1101,7 @@ SRCS = #{srcs.collect(&File.method(:basename)).join(' ')} OBJS = #{$objs} TARGET = #{target} DLLIB = #{dllib} -EXTSTATIC = #{$default_static != $static && $static || ""} +EXTSTATIC = #{$static || ""} STATIC_LIB = #{staticlib unless $static.nil?} } |