diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-14 23:06:03 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-11 18:43:48 +0200 |
| commit | 4108665b63ab432732b8b351568c255d872cc3ff (patch) | |
| tree | 79c890b3d999e6e6bfd631b8df72ae18947719aa /external/libgpg-error | |
| parent | Fix the minimal build-tools target (diff) | |
| download | core-4108665b63ab432732b8b351568c255d872cc3ff.tar.gz core-4108665b63ab432732b8b351568c255d872cc3ff.zip | |
WIN cross: fix gpg-related library builds
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
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external/libgpg-error')
| -rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index cf0b594dca24..736079c77aec 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -16,20 +16,18 @@ $(eval $(call gb_ExternalProject_register_targets,libgpg-error,\ $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)) ifeq ($(COM),MSC) -gb_ExternalProject_libgpg-error_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) -gb_ExternalProject_libgpg-error_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) -$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp) +$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target_for_build,cpp) $(call gb_Trace_StartRange,libgpg-error,EXTERNAL) $(call gb_ExternalProject_run,build,\ - MAKE=$(MAKE) ./configure \ + $(gb_WIN_GPG_cross_setup_exports) \ + && MAKE=$(MAKE) ./configure \ --enable-static \ --disable-shared \ --disable-rpath \ --disable-languages \ --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)'\' \ + $(gb_WIN_GPG_platform_switches) \ && $(MAKE) \ ) $(call gb_Trace_EndRange,libgpg-error,EXTERNAL) |