diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-10 15:00:00 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-10 15:00:00 +0530 |
| commit | 0a90cf9b32f1e095aed87823ae8e709ecf35b8a7 (patch) | |
| tree | 188e7992053f76e32babca30b417df84b70da557 | |
| parent | 436a874db29e9a2dde1945e2b80269612d2b0d5d (diff) | |
| parent | d0ae7caa49501250eba4fb6648c239748714f5c7 (diff) | |
| download | rust-0a90cf9b32f1e095aed87823ae8e709ecf35b8a7.tar.gz rust-0a90cf9b32f1e095aed87823ae8e709ecf35b8a7.zip | |
Rollup merge of #23236 - dhuseby:master, r=alexcrichton
this fixes the issue the bitrig autobuilder is running into.
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure index d56000b14e2..b0d0c3f29b8 100755 --- a/configure +++ b/configure @@ -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" |