Kaydet (Commit) f4889fa2 authored tarafından Matúš Kukan's avatar Matúš Kukan

use _use_static_libraries here again to ensure proper dependency

Change-Id: I04fb35b6eac1c1777e67de9877417cfe7cc5aac8
üst 233e2d3d
...@@ -1918,7 +1918,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ...@@ -1918,7 +1918,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus) $(call gb_LinkTarget_use_static_libraries,$(1),orcus)
endef endef
endif # SYSTEM_LIBORCUS endif # SYSTEM_LIBORCUS
......
...@@ -745,15 +745,6 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib))) ...@@ -745,15 +745,6 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
endef 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 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))))) $(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) $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment