diff options
| -rw-r--r-- | l10ntools/scripts/update_tree.pl | 2 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/l10ntools/scripts/update_tree.pl b/l10ntools/scripts/update_tree.pl index 568d99e36ad5..02faf6a37c72 100644 --- a/l10ntools/scripts/update_tree.pl +++ b/l10ntools/scripts/update_tree.pl @@ -44,7 +44,7 @@ terminate() if ( ! defined $inpath ); my $destpath = $inpath; my $with_lang = $ARGV[1]; -my $xmllint = $ENV{XMLLINT}; +my $xmllint = $ENV{XMLLINT} || "$ENV{OUTDIR_FOR_BUILD}/bin/xmllint"; $tree_target_prefix = $ARGV[4]; diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index d89cfa867c92..d68f79e357c1 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -40,7 +40,10 @@ gb_ExtensionTarget_PROPMERGECOMMAND := \ $(PERL) $(gb_ExtensionTarget_PROPMERGETARGET) gb_ExtensionTarget_UPDATETREETARGET := $(SRCDIR)/l10ntools/scripts/update_tree.pl -gb_ExtensionTarget_UPDATETREECOMMAND := $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET) +gb_ExtensionTarget_UPDATETREECOMMAND := \ + $(gb_Helper_set_ld_path) $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET) + # update_tree.pl calls xmllint, which needs $(gb_Helper_set_ld_path) if it + # is the internal one gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex) gb_ExtensionTarget_HELPEXCOMMAND := \ |