diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-24 16:16:10 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-09-24 14:20:30 +0000 |
| commit | 8b6ea31961fedc3e94d8d1bb0d599b14bcaaa618 (patch) | |
| tree | 6c0a1aa0ab9509bb01f07833e50ed676f228070f /solenv | |
| parent | 46325e3a2ea376ea2d8b641051a5cbde20596aeb (diff) | |
add gb_StaticLibrary_use_static_libraries
... which is probably not needed for LO internal code, but
very useful for RepositoryExternals.
Change-Id: I5bd8edb97454f89ed33b041460019738e9552f18
Reviewed-on: https://gerrit.libreoffice.org/692
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index dae113895c1a..f7fa86bbec6f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,13 +745,14 @@ $$(call gb_Output_error,\ gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries instead.) endef +# for a StaticLibrary, dependent libraries are not actually linked in define gb_LinkTarget_use_static_libraries ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk)) endif -$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(2)) $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_target,$$(lib))) $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index dd972fdba4be..12834d8a7815 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -125,6 +125,7 @@ $(eval $(foreach method,\ use_package \ use_packages \ use_unpacked \ + use_static_libraries \ add_sdi_headers \ set_warnings_not_errors \ set_generated_cxx_suffix \ |