[前][次][番号順一覧][スレッド一覧]

ruby-changes:65103

From: Nobuyoshi <ko1@a...>
Date: Mon, 1 Feb 2021 15:13:08 +0900 (JST)
Subject: [ruby-changes:65103] 952b2dcc88 (master): Fix for windres 2.36 [Bug #17602]

https://git.ruby-lang.org/ruby.git/commit/?id=952b2dcc88

From 952b2dcc8804cbf094f8f626e04bcb3f8e151005 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 1 Feb 2021 14:59:47 +0900
Subject: 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(-)

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index e9f186f..8609881 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -4,7 +4,10 @@ include Makefile https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L4
 
 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)
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]