mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
separate PRE_LIBRUBY_UPDATE
* Makefile.in, win32/Makefile.sub (PRE_LIBRUBY_UPDATE): separate definitions without miniruby. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
673ae0e3c9
commit
e28a7c204d
3 changed files with 8 additions and 3 deletions
|
@ -241,6 +241,8 @@ $(PROGRAM):
|
|||
$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
|
||||
$(Q) $(POSTLINK)
|
||||
|
||||
PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(exec) $(RM) $(LIBRUBY_EXTS)
|
||||
|
||||
# We must `rm' the library each time this rule is invoked because "updating" a
|
||||
# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
|
||||
# supported.
|
||||
|
|
|
@ -176,9 +176,6 @@ INSTRUBY_ARGS = $(SCRIPT_ARGS) \
|
|||
INSTALL_PROG_MODE = 0755
|
||||
INSTALL_DATA_MODE = 0644
|
||||
|
||||
PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
|
||||
$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
|
||||
|
||||
TESTSDIR = $(srcdir)/test
|
||||
TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
|
||||
EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
|
||||
|
|
|
@ -1057,6 +1057,12 @@ $(STUBPROGRAM): rubystub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME)
|
|||
$(Q) $(LDSHARED_2)
|
||||
!endif
|
||||
|
||||
!if "$(LIBRUBY_SO_UPDATE)" == ""
|
||||
PRE_LIBRUBY_UPDATE = $(RM) $(LIBRUBY_EXTS)
|
||||
!else
|
||||
PRE_LIBRUBY_UPDATE =
|
||||
!endif
|
||||
|
||||
$(LIBRUBY_A): $(OBJS) $(INITOBJS)
|
||||
$(ECHO) linking static-library $(@:\=/)
|
||||
$(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(INITOBJS)
|
||||
|
|
Loading…
Reference in a new issue