diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 17:34:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 22:52:56 +0200 |
| commit | 3fdb77f0827d374a7fa2f1e232920b6174d6b44b (patch) | |
| tree | b97e714c5940ea712d29a80943f69394af288b78 /solenv/gbuild/Library.mk | |
| parent | 2c8cc6e5c600d04ae545af9f9223b88c3a757eee (diff) | |
add new urelibs library merging some libraries from ure/lib/
There is no configure switch for this, URELIBS must be set.
This commit changes strategy to link also libraries being merged.
We need them for build tools like idlc, cppumaker, .., so the tools can
link against them now. This avoids circular dependencies.
Change-Id: Ic49e18ecbeaff84d4f5a7fafe8b1fbf45ed18c9b
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index a6d15a6f42fc..8db3cf04adc4 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -116,7 +116,7 @@ endef # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile $(call gb_Library_get_target,$(gb_Library__get_name)) : \ - COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out $(gb_MERGEDLIBS),$(1))),\ + COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(1))),\ $$(call gb_Output_error,$(1) already has a component file $$(COMPONENT)))$(2) $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\ @@ -129,7 +129,7 @@ $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef -gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1)) +gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(if $(filter $(1),$(gb_URELIBS)),urelibs,$(1))) gb_Library__get_componentprefix = \ $(call gb_Library__get_layer_componentprefix,$(call \ |