diff options
| -rw-r--r-- | Module_cross_tail_build.mk | 25 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 4 |
3 files changed, 24 insertions, 9 deletions
diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 2e15516be2d3..b7a077a982dd 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -31,16 +31,13 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ autodoc \ basegfx \ binaryurp \ - $(call gb_Helper_optional,BOOST,boost) \ bridges \ cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ + codemaker \ comphelper \ cosv \ cppu \ cppuhelper \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ i18npool \ i18nutil \ idl \ @@ -50,13 +47,10 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jurt \ jvmaccess \ jvmfwk \ - $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ o3tl \ offapi \ officecfg \ oovbaapi \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ registry \ remotebridges \ ridljar \ @@ -69,15 +63,28 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ store \ tools \ ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ unoil \ unotest \ unotools \ ure \ - xmlhelp \ xmlreader \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional_for_host,DESKTOP, \ + helpcompiler \ + i18nisolang1 \ + l10ntools \ + sot \ + svtools \ + toolkit \ + tools \ + unotools \ + vcl) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,ZLIB,zlib) \ )) diff --git a/configure.ac b/configure.ac index 1355f3c0da72..1436110f4900 100644 --- a/configure.ac +++ b/configure.ac @@ -12445,6 +12445,10 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h]) AC_CONFIG_HEADERS([config_host/config_version.h]) AC_OUTPUT +if test "$CROSS_COMPILING" = YES; then + (echo; echo export BUILD_TYPE_FOR_HOST=$BUILD_TYPE) >>config_build.mk +fi + # touch the config timestamp file if test ! -f config_host.mk.stamp; then echo > config_host.mk.stamp diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 15bf96510808..d013d140f5b1 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -216,4 +216,8 @@ define gb_Helper_optional $(if $(filter $(1),$(BUILD_TYPE)),$(2)) endef +define gb_Helper_optional_for_host +$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)) +endef + # vim: set noet sw=4 ts=4: |