summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-06-14 12:02:56 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-06-15 21:32:36 +0200
commit7369a8cad62ba6151ba8c16c41d0005fdf87f0ec (patch)
tree38d8981ddab6e1799e54479888c9ffac4469e4cd
parent86015b2c1bc2b33f8883ea6db3aba70f69cca720 (diff)
ucpp is not an ExternalExecutable
Change-Id: Ib9a82acd375d12c6050bc5674816993ef62eaa61
-rw-r--r--Repository.mk1
-rw-r--r--RepositoryExternal.mk17
2 files changed, 3 insertions, 15 deletions
diff --git a/Repository.mk b/Repository.mk
index 543275e5b1ee..281987e9407b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -693,7 +693,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
genccode \
gencmn \
python \
- ucpp \
xmllint \
xsltproc \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 777369ddbbee..e70c3f9a1111 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2852,11 +2852,13 @@ endef
endif
+ifeq (,$(SYSTEM_UCPP))
define gb_Executable__register_idlc
$(call gb_Executable_add_runtime_dependencies,idlc,\
- $(call gb_ExternalExecutable_get_dependencies,ucpp) \
+ $(call gb_Executable_get_target_for_build,ucpp) \
)
endef
+endif
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
@@ -2922,19 +2924,6 @@ 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