summaryrefslogtreecommitdiff
path: root/cygwin
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-02-01 14:59:47 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-02-01 14:59:47 +0900
commit952b2dcc8804cbf094f8f626e04bcb3f8e151005 (patch)
treed60706e49ae32ceef72a5a5225f552030fabff4f /cygwin
parent23a833ee67dcc2d285082103deb79741ed147961 (diff)
downloadruby-952b2dcc8804cbf094f8f626e04bcb3f8e151005.tar.gz
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.
Diffstat (limited to 'cygwin')
-rw-r--r--cygwin/GNUmakefile.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index e9f186f121..86098814a1 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -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)