diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-16 09:39:48 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-16 09:39:48 +0000 |
| commit | cc40e42757f63736333b13373575fb90ec544535 (patch) | |
| tree | 01ea494766954788b52c964a43b60734170f2485 | |
| parent | ccf234f713b0f0b345ecb7acde180032f5aa3a69 (diff) | |
| download | ruby-cc40e42757f63736333b13373575fb90ec544535.tar.gz ruby-cc40e42757f63736333b13373575fb90ec544535.tar.xz ruby-cc40e42757f63736333b13373575fb90ec544535.zip | |
* win32/Makefile.sub (config.status): should create *.pdb on ext/,
not .ext/.
* win32/Makefile.sub (config.status): convert the name of import
library.
* lib/mkmf.rb (create_makefile): now don't need to remove
$(TARGET).lib.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,14 @@ +Mon Feb 16 18:35:58 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (config.status): should create *.pdb on ext/, + not .ext/. + + * win32/Makefile.sub (config.status): convert the name of import + library. + + * lib/mkmf.rb (create_makefile): now don't need to remove + $(TARGET).lib. + Mon Feb 16 15:45:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: check functions, fork spawnv. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 627236814..c117741ee 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -965,7 +965,6 @@ site-install-rb: install-rb mfile.print "$(RUBYARCHDIR)/" if $extout mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n\t" mfile.print "@-$(RM) $@\n\t" - mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin mfile.print "@-$(MAKEDIRS) $(@D)\n\t" mfile.print LINK_SO, "\n\n" mfile.print "$(STATIC_LIB): $(OBJS)\n\t" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ba245e793..4454d5a6d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -369,7 +369,7 @@ s,@EXEEXT@,.exe,;t t s,@OBJEXT@,obj,;t t s,@XCFLAGS@,$(XCFLAGS),;t t s,@XLDFLAGS@,$(XLDFLAGS),;t t -s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=).lib,;t t +s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb,;t t s,@ARCH_FLAG@,$(ARCH_FLAG),;t t s,@STATIC@,$(STATIC),;t t s,@CCDLFLAGS@,,;t t |