summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk1
-rw-r--r--RepositoryExternal.mk17
2 files changed, 15 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk
index cb876cb64c5a..5a92fd676246 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -728,6 +728,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
genccode \
gencmn \
python \
+ ucpp \
xmllint \
xsltproc \
))
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