solenv/gbuild/platform/com_MSC_class.mk | 4 ++--
solenv/gbuild/platform/com_MSC_defs.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e60bebd4c5257b0f592d27c74399de1498ac725b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Feb 16 00:14:12 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Feb 26 00:37:41 2021 +0100
WIN don't use --wrapper-print-cmdline in verbose
This breaks configure, as it fails the check: "gcc-wrapper.exe
--wrapper-print-cmdline supports -c -o file.obj... no"
That's because that cmdline is written to stderr, but that check
also tests for the stderr output and diffs it with some linker
boilerplate, which definitly has a different command line, so
there is practically no way to use that flag with configure.
I'm not sure how that even passed here. Even a current autconf
still produces the same check code then the old libjpeg-turbo
configure script already contains.
Regression from commit 4108665b63ab432732b8b351568c255d872cc3ff
("WIN cross: fix gpg-related library builds"). Not sure, if I
should drop the whole flag....
Change-Id: Ie01b00c5890c66479c33c61589366ce35cc783ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110962
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 4564bc65cdde..f8a39cb4ab19 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -614,10 +614,10 @@ endef
gb_AUTOCONF_WRAPPERS = \
REAL_CC="$(shell cygpath -w $(filter-out -%,$(CC)))" \
REAL_CC_FLAGS="$(filter -%,$(CC))" \
- CC="$(call gb_Executable_get_target_for_build,gcc-wrapper) $(if
$(verbose),--wrapper-print-cmdline)" \
+ CC="$(call gb_Executable_get_target_for_build,gcc-wrapper)" \
REAL_CXX="$(shell cygpath -w $(filter-out -%,$(CXX)))" \
REAL_CXX_FLAGS="$(filter -%,$(CXX))" \
- CXX="$(call gb_Executable_get_target_for_build,g++-wrapper) $(if
$(verbose),--wrapper-print-cmdline)" \
+ CXX="$(call gb_Executable_get_target_for_build,g++-wrapper)" \
LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
gb_ExternalProject_INCLUDE := \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 93ed51c3ba52..e7ccb0107562 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -316,7 +316,7 @@ endef
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 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)'\'
# vim: set noet sw=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
