diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-05-01 10:40:58 +0200 |
---|---|---|
committer | Armin Le Grand (Allotropia) <armin.le.grand.extern@allotropia.de> | 2021-07-01 09:28:19 +0200 |
commit | b3b8c23bb3ea5294002c22bd5b47cff6008fa7a1 (patch) | |
tree | 88b1d517d7882d60995775c59148b25aab4ddfc0 /external/libgpg-error/ExternalProject_libgpg-error.mk | |
parent | Revert "avoid windres preprocessor quoting-messups with current cygwin" (diff) | |
download | core-b3b8c23bb3ea5294002c22bd5b47cff6008fa7a1.tar.gz core-b3b8c23bb3ea5294002c22bd5b47cff6008fa7a1.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)
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'external/libgpg-error/ExternalProject_libgpg-error.mk')
-rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) else |