diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-08-24 14:23:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-08-24 14:23:43 +0100 |
| commit | 87610049f8a1690598b84b0bf984cfa487ce1074 (patch) | |
| tree | 3a34ad0da2ce32184024f86a2a87926496f1a200 /solenv/gbuild/LinkTarget.mk | |
| parent | 75fac9839793f73c9833489f1d70bf4136881cbf (diff) | |
misc cleanups of mergelibs functionality
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 325a37d0ee5b..69683c58f74b 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -44,8 +44,10 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) endif -# if enabled we can create one library instead of more smaller -ifeq ($(MERGELIBS),YES) +# if enabled we link all of these libraries into one larger, merged library +# for which we can do a lot more optimisation, and which is faster to read +# from disk. +ifeq ($(MERGELIBS),TRUE) # list of libraries which are always loaded, thus we can merge them into one # they have to be from tail_build, so we could link against merged library gb_CORE_LIBS := \ @@ -733,7 +735,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 ($(MERGELIBS),YES) +ifeq ($(MERGELIBS),TRUE) gb_LINKED_LIBS := $(if $(filter $(gb_CORE_LIBS),$(2)),merged $(filter-out $(gb_CORE_LIBS),$(2)),$(2)) else gb_LINKED_LIBS := $(2) |