WIN cross: fix gpg-related library builds

Desktop / LibreOffice - Jan-Marek Glogowski [fbihome.de] - 11 September 2020 16:43 UTC

Cross compiling these libraries requires to supply the cross-compiler via the CC_FOR_BUILD environment variable. Since we have to use the gcc-wrappers, we now need two different invocations with different inclues and libraries, but just have fixed environment variables. Also, the CC_FOR_BUILD clashes with LO's own variant, but that is easy to fix.

So this change includes:- gcc-wrappers: new option --wrapper-env-prefix to add a prefix to the environment variable names- gcc-wrappers: new option --wrapper-print-cmdline to dump the real command called, when a verbose build is executed- gcc-wrappers: default to exe, if the output has no extension- unify build flags for gpg related libraries

Change-Id: I4e6a6ba3c6e09237c8ffefa40ce61131290a3852 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102482

4108665b63ab WIN cross: fix gpg-related library builds
config_host.mk.in | 3 ++
configure.ac | 12 +++--
external/gpgmepp/ExternalProject_gpgmepp.mk | 12 ++---
external/libassuan/ExternalProject_libassuan.mk | 11 ++---
.../libgpg-error/ExternalProject_libgpg-error.mk | 10 ++--
solenv/clang-format/excludelist | 2 -
solenv/gbuild/platform/com_MSC_class.mk | 4 +-
solenv/gbuild/platform/com_MSC_defs.mk | 8 ++++
solenv/gcc-wrappers/g++.cxx | 16 ++++---
solenv/gcc-wrappers/gcc.cxx | 16 ++++---
solenv/gcc-wrappers/wrapper.cxx | 56 ++++++++++++++++++++--
solenv/gcc-wrappers/wrapper.hxx | 4 +-
12 files changed, 107 insertions(+), 47 deletions(-)

Upstream: cgit.freedesktop.org


  • Share