From 647cd75166d9d40b3fe8f0abd10adf1612375ad0 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 12 Nov 2007 10:46:02 +0000 Subject: * {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT) instead of $(LIBRUBY_A). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bcc32/Makefile.sub | 2 +- win32/Makefile.sub | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49808e1760..ffc6e8309e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 12 19:45:18 2007 NAKAMURA Usaku + + * {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT) + instead of $(LIBRUBY_A). + Mon Nov 12 18:32:53 2007 Nobuyoshi Nakada * {bcc,win}32/Makefile.sub (MINIOBJS): added prelude.$(OBJEXT). diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 0c0556a7a8..c98876fac1 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -450,7 +450,7 @@ s,@top_srcdir@,$(srcdir),;t t miniruby$(EXEEXT): @echo $(LIBS) - $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS) + $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT),$@,nul,$(LIBS) $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 832ca7cf1d..efdeaae049 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -497,7 +497,7 @@ s,@top_srcdir@,$(srcdir),;t t miniruby$(EXEEXT): @echo. $(LIBS) - $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) -Fe$@ $(LDFLAGS) + $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS) $(LDSHARED_1) $(LDSHARED_2) -- cgit v1.2.3