diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-10-23 22:26:34 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-10-23 22:58:56 +0200 |
commit | cffdb8d6804105bc840a407a10890af556e586c9 (patch) | |
tree | 5f13a32ca72c5716795c8b2920c7b80ea1280d7b /solenv | |
parent | 4dc53ab0c3b3176ecfe7ea78c131d92a97d2bd14 (diff) |
gbuild: fix XcuMergeTarget build breakage:
Introduce gb_XcuFile_for_extension function to use the right file
depending on WITH_LANG setting.
Change-Id: Ibe4fc4e28fe445fc9391b68d370039528eab7ed8
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/Configuration.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index d1d4aeb036c6..a73888e9dfd3 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -512,4 +512,12 @@ $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_g endef +# apparently extensions package the XcuMergeTarget directly... +# trivial convenience function to get the right file: +ifeq ($(gb_WITH_LANG),) +gb_XcuFile_for_extension = $(call gb_Configuration__get_source,,$(1)) +else +gb_XcuFile_for_extension = $(call gb_XcuMergeTarget_get_target,$(1)) +endif + # vim: set noet sw=4 ts=4: |