nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct building documenation with Pandoc and TeX on Windows.

Browse Source
This commit is contained in:
Vitali Haravy 2014-11-06 11:56:16 +00:00 committed by Vitali Haravy
parent bec2ee77f7
commit 461945ee9e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -86,7 +86,7 @@ putpathvar() {
else else
printf "configure: %-20s := %s %s\n" $1 "$T" "$2" printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
fi fi
printf "%-20s := %q\n" $1 "$T" >>config.tmp printf "%-20s := \"%s\"\n" $1 "$T" >>config.tmp
} }
probe() { probe() {
@ -651,9 +651,9 @@ probe CFG_ADB adb
if [ ! -z "$CFG_PANDOC" ] if [ ! -z "$CFG_PANDOC" ]
then then
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' | PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
# extract the first 2 version fields, ignore everything else # extract the first 2 version fields, ignore everything else
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/') sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
MIN_PV_MAJOR="1" MIN_PV_MAJOR="1"
MIN_PV_MINOR="9" MIN_PV_MINOR="9"

2
mk/reconfig.mk
View File

@ -19,7 +19,7 @@ ifndef CFG_DISABLE_MANAGE_SUBMODULES
# (nothing checked out at all). `./configure --{llvm,jemalloc}-root` # (nothing checked out at all). `./configure --{llvm,jemalloc}-root`
# will explicitly deinitialize the corresponding submodules, and we don't # will explicitly deinitialize the corresponding submodules, and we don't
# want to force constant rebuilds in that case. # want to force constant rebuilds in that case.
NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+') NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && $(CFG_GIT) submodule status | grep -c '^+')
else else
NEED_GIT_RECONFIG=0 NEED_GIT_RECONFIG=0
endif endif