* common.mk, configure.in: rename the bin directory to run build
  executable as exe, to get rid of overwriting true files at the
  installation.  [ruby-dev:50250] [Bug #13911]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-17 04:14:51 +00:00
Родитель 08adad00ff
Коммит 3029014467
4 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -414,7 +414,7 @@ clean-local::
$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
enc/encinit.c enc/encinit.$(OBJEXT)
-$(Q)$(RM) $(pkgconfig_DATA)
-$(Q)$(RMALL) bin/$(PROGRAM) ruby-runner.h *.dSYM
-$(Q)$(RMALL) exe/ ruby-runner.h *.dSYM
distclean-local::
$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile

Просмотреть файл

@ -777,12 +777,12 @@ $(PLATFORM_D):
$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
@exit > $@
bin/$(PROGRAM): ruby-runner.c ruby-runner.h $(TIMESTAMPDIR)/.bin.time
exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time
$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
$(TIMESTAMPDIR)/.bin.time:
$(Q) $(MAKEDIRS) bin $(@D)
$(Q) exit > $@
exe/.time:
$(Q) $(MAKEDIRS) exe $(@D)
@exit > $@
$(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)

Просмотреть файл

@ -4028,7 +4028,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"' bin/$(PROGRAM)'
[PREP="$PREP"' exe/$(PROGRAM)'
AC_MSG_RESULT(yes)]
)
])

Просмотреть файл

@ -74,7 +74,7 @@ env = {
'RUBY_FIBER_MACHINE_STACK_SIZE' => '1',
}
runner = File.join(abs_archdir, "bin/ruby#{config['EXEEXT']}")
runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}")
runner = nil unless File.exist?(runner)
abs_ruby = runner || File.expand_path(ruby)
env["RUBY"] = abs_ruby