diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-09-03 01:08:47 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-09-03 19:20:03 +0900 |
| commit | 6f5305e0d2b4711b186ece8160716c7f9439ea8d (patch) | |
| tree | 510f1e46c385499bd2e8ba4b6e0bc38cb3f8d011 | |
| parent | 21a5da3c4c803987c48bc9ca588948c50715631a (diff) | |
Exclude LIBPATHENV wrapper from PREP
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | template/Makefile.in | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -925,11 +925,11 @@ $(PLATFORM_D): $(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D) @$(NULLCMD) > $@ -exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h +exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time $(PREP) {$(VPATH)}config.h $(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c $(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS) $(Q) $(POSTLINK) - $(Q) ./miniruby$(EXEEXT) \ + $(Q) $(BOOTSTRAPRUBY) \ -e 'prog, dest, inst = ARGV; dest += "/ruby"' \ -e 'exit unless prog==inst' \ -e 'unless prog=="ruby"' \ diff --git a/configure.ac b/configure.ac index 2fd68c0013..d6ed24c5b7 100644 --- a/configure.ac +++ b/configure.ac @@ -3621,7 +3621,7 @@ AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [ AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed) AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null], [AC_MSG_RESULT(no)], - [PREP="$PREP"' exe/$(PROGRAM)' + [AC_SUBST(XRUBY_LIBPATHENV_WRAPPER, 'exe/$(PROGRAM)') AC_MSG_RESULT(yes)] ) ]) diff --git a/template/Makefile.in b/template/Makefile.in index f60986a53f..c5a926b538 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -297,6 +297,8 @@ $(PROGRAM): $(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@ $(Q) $(POSTLINK) +$(PROGRAM): @XRUBY_LIBPATHENV_WRAPPER@ + PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(gnumake:yes=exec) $(RM) $(LIBRUBY_EXTS) # We must `rm' the library each time this rule is invoked because "updating" a |