fix dep on internal ucpp

Change-Id: I42bbb3e53aaaad0e6b7df44ec2def038ac1a31eb

1 files changed, 46 insertions, 40 deletions

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 02f8998de1e1..74b0368ec209 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -171,6 +171,52 @@ include $(SRCDIR)/Repository.mk
 include $(SRCDIR)/RepositoryExternal.mk
 $(eval $(call gb_Helper_collect_libtargets))
 
+# Set up build tools that can be either internal or system. It is
+# necessary to do it before we start including gbuild class makefiles,
+# so the classes can add dependencies on them.
+#
+# TODO: As more external modules are converted, we would need more of
+# these (e.g., ICU tools). Maybe the definitions should be moved to
+# RepositoryExternal.mk ?
+ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
+gb_XSLTPROCTARGET :=
+gb_XSLTPROC := xsltproc
+else
+gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+endif
+
+ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
+gb_XMLLINTTARGET :=
+gb_XMLLINT := xsltproc
+else
+gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
+gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET)
+endif
+
+ifeq ($(SYSTEM_PYTHON),YES)
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(OS),MACOSX)
+#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
+#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
+#dirs for in-tree internal python
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(DISABLE_PYTHON),TRUE)
+# Build-time python
+gb_PYTHON := python
+else
+gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python)
+gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
+endif
+
+ifneq (,$(SYSTEM_UCPP))
+gb_UCPPTARGET :=
+else
+gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
+endif
+
 gb_Library_DLLPOSTFIX := lo
 
 # Include platform/cpu/compiler specific config/definitions
@@ -379,46 +425,6 @@ endif
 
 endef
 
-
-ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
-gb_XSLTPROCTARGET :=
-gb_XSLTPROC := xsltproc
-else
-gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
-endif
-
-ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
-gb_XMLLINTTARGET :=
-gb_XMLLINT := xsltproc
-else
-gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET)
-endif
-
-ifeq ($(SYSTEM_PYTHON),YES)
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(OS),MACOSX)
-#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
-#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
-#dirs for in-tree internal python
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(DISABLE_PYTHON),TRUE)
-# Build-time python
-gb_PYTHON := python
-else
-gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python)
-gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
-endif
-
-ifneq (,$(SYSTEM_UCPP))
-gb_UCPPTARGET :=
-else
-gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
-endif
-
 .PHONY: help
 help:
 	@cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt