diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-08 14:14:46 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-13 16:26:10 +0100 |
| commit | bdfdd054bd25714f9c52c974f22228bee4bfbe67 (patch) | |
| tree | 5d52309c4d07614d1e555af2e010544cdb3994a1 /registry | |
| parent | 3909015f5dd1cbd18de80f38cd1fe675b7c59b7e (diff) | |
more subtle dependencies for cross-compilation
Now we build only what we really need for 'build' platform - there is
new build-tools make target.
The list of tools is in solenv/gbuild/extensions/pre_BuildTools.mk.
Also similar is done to some extent for 'host' platform using
gb_Module_add_targets_for_build which is ignored for 'host'.
Change-Id: I6acd1762b16aca366aac1a0688500f27869cfca2
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/Module_registry.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index a488bd8b14e4..6aec72fb23b2 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -27,17 +27,18 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ - Library_reg \ - ZipPackage_registry_odk_headers \ + Library_reg \ + ZipPackage_registry_odk_headers \ )) -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +# if not cross-compiling or we need this for ODK +ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,registry,\ - StaticLibrary_registry_helper \ - Executable_regmerge \ - Executable_regview \ - Executable_regcompare \ + Executable_regcompare \ + Executable_regmerge \ + Executable_regview \ + StaticLibrary_registry_helper \ )) endif |