diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-03 02:36:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-03 02:36:48 +0000 |
commit | b1fd732b4fa3335978c9460ceaa80c828ecee641 (patch) | |
tree | ddfaa5026badf8c203c2c19e929561f026234e99 | |
parent | c772f4906adf06a429ce2d2785d91acc64817619 (diff) |
* ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
* lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | MANIFEST | 1 | ||||
-rw-r--r-- | ext/extmk.rb | 2 | ||||
-rw-r--r-- | lib/mkmf.rb | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Dec 3 11:36:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb. + + * lib/mkmf.rb (configuration): DLDFLAGS was duplicated. + Tue Dec 2 23:18:12 2003 Minero Aoki <aamine@loveruby.net> * lib/net/http.rb: wrote the warning about HTTP_PROXY environment @@ -84,6 +84,7 @@ bcc32/setup.mak bin/erb bin/irb bin/rdoc +bin/testrb cygwin/GNUmakefile.in djgpp/GNUmakefile.in djgpp/README.djgpp diff --git a/ext/extmk.rb b/ext/extmk.rb index 5f99c85ea9..fe777a4ceb 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -184,7 +184,7 @@ end $ruby << " -I$(topdir) -I$(hdrdir)/lib" $config_h = '$(topdir)/config.h' -MTIMES = [File.mtime(__FILE__)] +MTIMES = [__FILE__, srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)} # get static-link modules $static_ext = {} diff --git a/lib/mkmf.rb b/lib/mkmf.rb index bb79a5e4c5..080aa051b1 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -725,7 +725,7 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS #$ARCH_FLAG CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} -DLDFLAGS = #$LDFLAGS #{CONFIG['DLDFLAGS']} #$DLDFLAGS #$ARCH_FLAG +DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG LDSHARED = #{CONFIG['LDSHARED']} AR = #{CONFIG['AR']} EXEEXT = #{CONFIG['EXEEXT']} |