kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 952b2dcc88: [Backport #17602]

Browse source 
Fix for windres 2.36 [Bug #17602]

	Add --preprocessor and --preprocessor-arg for each preprocessor
	command arguments, as windres 2.36 requires preprocessor name and
	arguments to be separated to respect spaces in these paths.
	---
	 cygwin/GNUmakefile.in | 5 ++++-
	 1 file changed, 4 insertions(+), 1 deletion(-)
This commit is contained in:
NARUSE, Yui 2021-02-01 20:27:16 +09:00
parent 42f02a0bac
commit d1fb0a3953
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cygwin/GNUmakefile.in
View file

@ -4,7 +4,10 @@ include Makefile
ENABLE_SHARED=@ENABLE_SHARED@
DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
windres-cpp := $(CPP) -xc
windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED
STRIP = @STRIP@
ifeq (@target_os@,cygwin)

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 19
#define RUBY_PATCHLEVEL 20
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2