diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 15:38:52 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 15:44:43 +0200 |
| commit | c83d82e71b7c792190489529f15957eed31f60e0 (patch) | |
| tree | 7d7b6d398ffd0e8ad04c4e8f00a32eed4db8bf48 /solenv | |
| parent | e31e8a13b859d182a8e4719a1037c27d12ef63bc (diff) | |
fix few problems with gbuildized liborcus
Change-Id: Ic8717085f0f71470eadc225eb062c1dee24d24f7
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 955b13d9e019..7d54809d0390 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,18 +745,12 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib))) endef -define gb_LinkTarget_add_linked_static_external_libs -$$(call gb_Output_error,\ - gb_LinkTarget_add_linked_static_external_libs: use gb_LinkTarget_use_static_external_libraries instead.) -endef - -# TODO: why do we need this? -define gb_LinkTarget_use_static_external_libraries - +# 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)) : $$(foreach lib,$(2),$$(call gb_ExternalLibs_get_target,$$(lib))) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : $$(foreach lib,$(2),$$(call gb_ExternalLibs_get_target,$$(lib))) +$(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 |