1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shell dependent command should be in Makefile.in

Browse Source 
As common.mk is used by nmake.exe, the commands there need to be
accepted also by cmd.exe.
This commit is contained in:
Nobuyoshi Nakada 2024-11-26 01:04:07 +09:00 committed by Nobuyoshi Nakada
parent 16d98dc3c1
commit c5d31cb96b
Notes: git 2024-11-26 10:06:46 +00:00 
Merged: https://github.com/ruby/ruby/pull/12166
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.mk
View File

@ -1943,14 +1943,8 @@ rewindable:
HELP_EXTRA_TASKS = ""
shared-gc: probes.h
$(Q) if test -z $(shared_gc_dir); then \
echo "You must configure with --with-shared-gc to use shared GC"; \
exit 1; \
elif test -z $(SHARED_GC); then \
echo "You must specify SHARED_GC with the GC to build"; \
exit 1; \
fi
shared-gc-precheck:
shared-gc: probes.h shared-gc-precheck
$(Q) $(MAKEDIRS) $(shared_gc_dir) .gc/$(arch)/$(SHARED_GC)
$(Q) $(RUNRUBY) -C .gc/$(arch)/$(SHARED_GC) $(CURDIR)/$(srcdir)/gc/$(SHARED_GC)/$(EXTCONF)
$(Q) $(CHDIR) .gc/$(arch)/$(SHARED_GC) && \

10
template/Makefile.in
View File

@ -348,6 +348,16 @@ $(ruby_pc): config.status Makefile
$(Q)pkg_config=${PKG_CONFIG} && PKG_CONFIG_PATH=. $${pkg_config:-:} --print-errors ruby.tmp
$(Q)$(MV) -f ruby.tmp.pc $(ruby_pc)
shared-gc-precheck:
$(Q) if test -z $(shared_gc_dir); then \
echo "You must configure with --with-shared-gc to use shared GC"; \
exit 1; \
fi
$(Q) if test -z $(SHARED_GC); then \
echo "You must specify SHARED_GC with the GC to build"; \
exit 1; \
fi
pre-install-local:: pkgconfig-data
ruby-runner.h: template/ruby-runner.h.in config.status