solenv/gbuild/platform/com_MSC_defs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3589180bfa67bc2ef411a56c9e8bb161f6c59902
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 1 10:40:58 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 4 11:03:48 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 <g...@litvinovg.pro>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 07f1ec0af02a9ab6c1bf6e6478092ee50495afa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114971
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 892faf76931b..de856cf79cc6 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -367,6 +367,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
-%,$(CC_FOR_BUILD))" REAL_BUILD_CC_FLAGS="$(filter -%,$(CC_FOR_BUILD))" \
&& export CC_FOR_BUILD="$(call
gb_Executable_get_target_for_build,gcc-wrapper) $(if
$(verbose),--wrapper-print-cmdline) --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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
