diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-11 21:03:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-13 11:02:46 +0000 |
| commit | 56122bdf25c64ef8ebdab0c7d83eb8bd94e3aa41 (patch) | |
| tree | f441b4545ca530a6c85684261aee0454f61d6b7b /solenv | |
| parent | WaE: class has virtual functions, but destructor is not virtual (diff) | |
| download | core-56122bdf25c64ef8ebdab0c7d83eb8bd94e3aa41.tar.gz core-56122bdf25c64ef8ebdab0c7d83eb8bd94e3aa41.zip | |
tell tooling about xmllint
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 65d5a809ee8b..b544f749bced 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -313,6 +313,14 @@ 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) diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 0418fc11393e..4de797c6c302 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -42,6 +42,14 @@ XSLTPROC=$(AUGMENT_LIBRARY_PATH) xsltproc .ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" .ENDIF +.IF "$(XMLLINT)"=="" +.IF "$(SYSTEM_LIBXML)"!="YES" +XMLLINT=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmllint +.ELSE # "$(SYSTEM_LIBXML)"!="YES" +XMLLINT=$(AUGMENT_LIBRARY_PATH) xmllint +.ENDIF # "$(SYSTEM_LIBXML)"!="YES" +.ENDIF + ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend |