diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-05-01 10:40:58 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-30 17:52:46 +0200 |
| commit | 731010a3124c92458be5c7c4839e8804d1c32463 (patch) | |
| tree | daa2ac8dfab5f249a1256bb59aa2644c0129dea9 /external/gpgmepp | |
| parent | sw: layout: fix table split loop caused by RemoveFollowFlowLinePending (diff) | |
| download | core-731010a3124c92458be5c7c4839e8804d1c32463.tar.gz core-731010a3124c92458be5c7c4839e8804d1c32463.zip | |
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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965
Tested-by: Jenkins
Reviewed-by: Georgy Litvinov <git@litvinovg.pro>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 07f1ec0af02a9ab6c1bf6e6478092ee50495afa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114971
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3589180bfa67bc2ef411a56c9e8bb161f6c59902)
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
Diffstat (limited to 'external/gpgmepp')
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 8ecdf60e6f87..e190f44eda63 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target_for_build,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) |