[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07f1ec0af02a9ab6c1bf6e6478092ee50495afa7
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sat May 1 10:40:58 2021 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sat May 1 15:07:31 2021 +0200

    avoid windres preprocessor quoting-messups with current cygwin
    
    apparently fresh installs of cygwin behave differently with the windres
    command's quoting and treats --preprocessor='cpp foo bar' as a single file
    "cpp foo bar" to run instead of running "cpp" with the arguments "foo"
    and "bar".
    (-D and -I options are passed to the preprocessor automatically, so no
    need to prefix those with --preprocessor-arg)
    
    Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965
    Tested-by: Jenkins
    Reviewed-by: Georgy Litvinov <git at litvinovg.pro>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 708d30f023c8..0ec843e9889e 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -317,6 +317,6 @@ gb_WIN_GPG_WINDRES_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 gb_WIN_GPG_platform_switches := --build=$(BUILD_PLATFORM) --host=$(subst cygwin,mingw32,$(HOST_PLATFORM))
 gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out -%,$(UNCACHED_CC))" REAL_BUILD_CC_FLAGS="$(filter -%,$(UNCACHED_CC))" \
     && export CC_FOR_BUILD="$(call gb_Executable_get_target_for_build,gcc-wrapper) --wrapper-env-prefix=REAL_BUILD_ $(SOLARINC) -L$(subst ;, -L,$(ILIB_FOR_BUILD))" \
-    && export RC='windres -O COFF --target=$(gb_WIN_GPG_WINDRES_target) --preprocessor='\''$(call gb_Executable_get_target_for_build,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\'
+    && export RC='windres -O COFF --target=$(gb_WIN_GPG_WINDRES_target) --preprocessor=$(call gb_Executable_get_target_for_build,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'
 
 # vim: set noet sw=4: