diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | common.mk | 3 | ||||
-rw-r--r-- | win32/Makefile.sub | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index eeda81b0b3..aaabcb8bc3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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/ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 56303ccdb0..9ac87ab6e3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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) |