diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 18:23:27 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 18:23:50 +0200 |
| commit | f4889fa21f7fb99477148dfed7fa40ba583cb63d (patch) | |
| tree | 5897a7c60cd10c6b3d1baba75508e17a9b5a2992 | |
| parent | 233e2d3d842a81f75ce581ba787cc917729c35f8 (diff) | |
use _use_static_libraries here again to ensure proper dependency
Change-Id: I04fb35b6eac1c1777e67de9877417cfe7cc5aac8
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 139058579854..fcc478292f89 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1918,7 +1918,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus) +$(call gb_LinkTarget_use_static_libraries,$(1),orcus) endef endif # SYSTEM_LIBORCUS diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 7d54809d0390..96178bcc6c73 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,15 +745,6 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib))) endef -# gb_LinkTarget_use_static_external_library linktarget library externalproject -define gb_LinkTarget_use_static_external_library -$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2) - -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(3)) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : $(call gb_ExternalProject_get_target,$(3)) - -endef - define gb_LinkTarget_add_cobject $(if $(wildcard $(call gb_CObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_CObject_get_source,$(SRCDIR),$(2))))) $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) |