summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-10-20 20:43:46 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-21 08:01:12 +0200
commitce038cf8d75dde575643042e57addf559eb57059 (patch)
tree083817762f7d0822d3f775f38a447b8558384f8e /RepositoryExternal.mk
parente7d1e2c769afbd0593facf87a084a8d63d134be2 (diff)
Revert "ucpp is not an ExternalExecutable"
Wrong! It is. This reverts commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec.
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk17
1 files changed, 14 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 20a488155c64..3877dc21db1d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2953,13 +2953,11 @@ endef
endif
-ifeq (,$(SYSTEM_UCPP))
define gb_Executable__register_idlc
$(call gb_Executable_add_runtime_dependencies,idlc,\
- $(call gb_Executable_get_target_for_build,ucpp) \
+ $(call gb_ExternalExecutable_get_dependencies,ucpp) \
)
endef
-endif
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
@@ -3028,6 +3026,19 @@ endef
endif # SYSTEM_LIBXSLT_FOR_BUILD
+ifneq (,$(SYSTEM_UCPP))
+
+gb_ExternalExecutable__register_ucpp :=
+
+else # ! SYSTEM_UCPP
+
+define gb_ExternalExecutable__register_ucpp
+$(call gb_ExternalExecutable_set_internal,ucpp)
+
+endef
+
+endif # SYSTEM_UCPP
+
ifeq (,$(PYTHON_FOR_BUILD))
define gb_ExternalExecutable__register_python