ruby-changes:50332
From: nobu <ko1@a...>
Date: Sat, 17 Feb 2018 14:52:27 +0900 (JST)
Subject: [ruby-changes:50332] nobu:r62447 (trunk): separate PRE_LIBRUBY_UPDATE
nobu 2018-02-17 14:52:20 +0900 (Sat, 17 Feb 2018) New Revision: 62447 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62447 Log: separate PRE_LIBRUBY_UPDATE * Makefile.in, win32/Makefile.sub (PRE_LIBRUBY_UPDATE): separate definitions without miniruby. Modified files: trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: common.mk =================================================================== --- common.mk (revision 62446) +++ common.mk (revision 62447) @@ -176,9 +176,6 @@ INSTRUBY_ARGS = $(SCRIPT_ARGS) \ https://github.com/ruby/ruby/blob/trunk/common.mk#L176 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/ Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 62446) +++ win32/Makefile.sub (revision 62447) @@ -1057,6 +1057,12 @@ $(STUBPROGRAM): rubystub.$(OBJEXT) $(LIB https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1057 $(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) Index: Makefile.in =================================================================== --- Makefile.in (revision 62446) +++ Makefile.in (revision 62447) @@ -241,6 +241,8 @@ $(PROGRAM): https://github.com/ruby/ruby/blob/trunk/Makefile.in#L241 $(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. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/