Rollup merge of #23236 - dhuseby:master, r=alexcrichton

this fixes the issue the bitrig autobuilder is running into.
This commit is contained in:
Manish Goregaokar 2015-03-10 15:00:00 +05:30
commit 0a90cf9b32

2
configure vendored
View File

@ -701,8 +701,8 @@ probe CFG_ADB adb
if [ ! -z "$CFG_PANDOC" ]
then
# Extract "MAJOR MINOR" from Pandoc's version number
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
# Extract "MAJOR MINOR" from Pandoc's version number
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
MIN_PV_MAJOR="1"