diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-15 12:02:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-15 12:52:18 +0300 |
| commit | 6df3de95cdbed9b68ee89bcd7402c17dc62324a5 (patch) | |
| tree | c479f8f95bd69935b1343be8eb8bfa3efd74da88 /solenv | |
| parent | Calc Sort: Introducing new method AddKeyItem to avoid code duplication (diff) | |
| download | core-6df3de95cdbed9b68ee89bcd7402c17dc62324a5.tar.gz core-6df3de95cdbed9b68ee89bcd7402c17dc62324a5.zip | |
Revert "Don't build unneccesary libraries twice"
It broke cross-compilation at least for me:
No rule to make target 'cppumaker', needed by 'build-tools'
This reverts commit 4960f665194760fc913cbfb97d35c1c182bbdd0d.
Change-Id: I29c16aa2c094692c26f77164e15ed4f4b2a82dac
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0d5f24b0437e..98964d764ff5 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -443,9 +443,7 @@ mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2)) endef $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY) - $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib)))),\ - $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\ - $(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid > $@),$(call gb_LinkTarget__command,$@,$*)) + $(call gb_LinkTarget__command,$@,$*) $(call gb_LinkTarget__command_objectlist,$@,$*) ifeq ($(gb_FULLDEPS),$(true)) @@ -838,26 +836,8 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ endef -gb_BUILD_LIBS := basegfx \ - reg \ - sal \ - salhelper \ - store \ - tl \ - unoidl - -gb_BUILD_TOOLS := cppumaker \ - idlc \ - regmerge \ - rsc \ - svidl - -define gb_LinkTarget__is_build_lib -$(if $(filter $(1),$(foreach lib,$(gb_BUILD_LIBS),$(call gb_Library_get_linktargetname,$(lib)))),$(true),$(false)) -endef - -define gb_LinkTarget__is_build_tool -$(if $(filter $(1),$(addprefix Executable/,$(gb_BUILD_TOOLS))),$(true),$(false)) +define gb_Linktarget__is_build_tool +$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge rsc svidl)),$(true),$(false)) endef define gb_LinkTarget_use_libraries @@ -866,7 +846,7 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) endif -ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true)) +ifeq ($(call gb_Linktarget__is_build_tool,$(1)),$(true)) $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4)) else |