nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #21992 - steveklabnik:gh17220, r=alexcrichton

Browse Source 
None of the others work, so let's remove them.

Fixes #17220.

r? @brson
This commit is contained in:
bors 2015-02-08 23:24:33 +00:00
commit 00df3251f6
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -653,9 +653,7 @@ probe CFG_GRUN grun
probe CFG_FLEX flex probe CFG_FLEX flex
probe CFG_BISON bison probe CFG_BISON bison
probe CFG_PANDOC pandoc probe CFG_PANDOC pandoc
probe CFG_PDFLATEX pdflatex
probe CFG_XELATEX xelatex probe CFG_XELATEX xelatex
probe CFG_LUALATEX lualatex
probe CFG_GDB gdb probe CFG_GDB gdb
probe CFG_LLDB lldb probe CFG_LLDB lldb

21
mk/docs.mk
View File

@ -85,27 +85,16 @@ else
HTML_DEPS := HTML_DEPS :=
endif endif
# Check for the various external utilities for the EPUB/PDF docs: # Check for xelatex
ifeq ($(CFG_LUALATEX),) ifeq ($(CFG_XELATEX),)
$(info cfg: no lualatex found, deferring to xelatex)
ifeq ($(CFG_XELATEX),)
$(info cfg: no xelatex found, deferring to pdflatex)
ifeq ($(CFG_PDFLATEX),)
$(info cfg: no pdflatex found, disabling LaTeX docs)
NO_PDF_DOCS = 1
else
CFG_LATEX := $(CFG_PDFLATEX)
endif
else
CFG_LATEX := $(CFG_XELATEX) CFG_LATEX := $(CFG_XELATEX)
XELATEX = 1 XELATEX = 1
endif else
else $(info cfg: no xelatex found, disabling LaTeX docs)
CFG_LATEX := $(CFG_LUALATEX) NO_PDF_DOCS = 1
endif endif
ifeq ($(CFG_PANDOC),) ifeq ($(CFG_PANDOC),)
$(info cfg: no pandoc found, omitting PDF and EPUB docs) $(info cfg: no pandoc found, omitting PDF and EPUB docs)
ONLY_HTML_DOCS = 1 ONLY_HTML_DOCS = 1