summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-22 04:19:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-22 04:19:26 +0000
commit0b178b8bed6061a16427aba8264b75ae19756fc8 (patch)
tree9ca18bafd96f4a37b3c6ef3586d128166c6b5b0c /lib
parent0f827f9562c98c3119798d42d517b96ba7f77478 (diff)
downloadruby-0b178b8bed6061a16427aba8264b75ae19756fc8.tar.gz
ruby-0b178b8bed6061a16427aba8264b75ae19756fc8.tar.xz
ruby-0b178b8bed6061a16427aba8264b75ae19756fc8.zip
* instruby.rb: add dryrun mode.
* ext/extmk.rb (extmake): avoid Borland make's quirk behavior. * lib/mkmf.rb (link_command): opt is not a makefile macro. * bcc32/Makefile.sub ($(LIBRUBY_SO) $(LIBRUBY)): EXTOBJS were not linked. * bcc32/Makefile.sub (ext/extinit.obj): missing. * bcc32/Makefile.sub (TRY_LINK): options have to place before any non-option arguments. * win32/Makefile.sub (TRY_LINK): need -link and -libpath options. * bcc32/Makefile.sub, win32/Makefile.sub (RANLIB): logical operator never work with command.com. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a4ddda06d..561642528 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -206,7 +206,7 @@ def link_command(ldflags, opt="", libpath=$LIBPATH)
'LDFLAGS' => "#$LDFLAGS #{ldflags}",
'LIBPATH' => libpathflag(libpath),
'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
- 'LIBS' => "#$LIBRUBYARG ${opt} #$LIBS")
+ 'LIBS' => "#$LIBRUBYARG #{opt} #$LIBS")
end
def cc_command(opt="")
@@ -750,6 +750,7 @@ DISTCLEANFILES =
end
mfile.print "$(DLLIB): $(OBJS)\n\t"
+ mfile.print "@-$(RM) $@\n\t"
if $static
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$(DLLIB) $(OBJS)"
if ranlib = config_string('RANLIB')