diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-22 02:41:58 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-29 17:30:26 +0200 |
| commit | e9301742254b85f4c6fbfd9378b365c76f5ff367 (patch) | |
| tree | 1be461c1d4229562eb69134ca1f7964879e25c53 /RepositoryFixes.mk | |
| parent | 8196c0a0a532dc1b8577d1aa530c8f9f47fc3e61 (diff) | |
gbuild: implement gb_Library_get_target_for_build
I was wondering why removing instdir stuff forced a rebuild of
the cross toolset. Turned out some cross-toolset bits were wrongly
depending on host build stuff. It even had FIXME...
As a consequence, gb_CPPU_ENV was replaced by config_host.mk flags
to provide an CPPU_ENV_FOR_BUILD and also uses the correct
OS_FOR_BUILD.
Change-Id: I50e8e8dca50ab1ad3164948a585a792a52e4a39a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116359
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 741f6bbfee21..db78722ce545 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -40,8 +40,6 @@ endif gb_Executable_FILENAMES := $(patsubst soffice_exe:soffice_exe%,soffice_exe:soffice.exe,$(gb_Executable_FILENAMES)) gb_Executable_FILENAMES := $(patsubst soffice_com:soffice_com%,soffice_com:soffice.com,$(gb_Executable_FILENAMES)) -gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES)) - # fixes for .jnilibs on macOS that are not also needed as .dylibs: ifeq ($(OS),MACOSX) gb_Library_FILENAMES := \ @@ -100,4 +98,7 @@ gb_Library_FILENAMES += $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):lib$( endif # ifeq ($(OS),WNT) +gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES)) +gb_Library_FILENAMES_FOR_BUILD := $(subst $(gb_Library_PLAINEXT),$(gb_Library_PLAINEXT_FOR_BUILD),$(gb_Library_FILENAMES)) + # vim: set noet sw=4 ts=4: |