Skip to content

Commit 48a5004

Browse files
committed
Auto merge of #28789 - rkruppe:rm-unused-probes, r=alexcrichton
The code using them was removed in #27789.
2 parents 168a23e + 4df35ba commit 48a5004

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

configure

-28
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,6 @@ probe CFG_ANTLR4 antlr4
766766
probe CFG_GRUN grun
767767
probe CFG_FLEX flex
768768
probe CFG_BISON bison
769-
probe CFG_PANDOC pandoc
770-
probe CFG_XELATEX xelatex
771769
probe CFG_GDB gdb
772770
probe CFG_LLDB lldb
773771

@@ -826,26 +824,6 @@ step_msg "looking for target specific programs"
826824

827825
probe CFG_ADB adb
828826

829-
if [ -n "$CFG_PANDOC" ]
830-
then
831-
# Extract "MAJOR MINOR" from Pandoc's version number
832-
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
833-
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
834-
835-
MIN_PV_MAJOR="1"
836-
MIN_PV_MINOR="9"
837-
838-
# these patterns are shell globs, *not* regexps
839-
PV_MAJOR=${PV_MAJOR_MINOR% *}
840-
PV_MINOR=${PV_MAJOR_MINOR#* }
841-
842-
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
843-
then
844-
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
845-
BAD_PANDOC=1
846-
fi
847-
fi
848-
849827
BIN_SUF=
850828
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ]
851829
then
@@ -1775,12 +1753,6 @@ then
17751753
fi
17761754

17771755

1778-
if [ -n $BAD_PANDOC ]
1779-
then
1780-
CFG_PANDOC=
1781-
putvar CFG_PANDOC
1782-
fi
1783-
17841756
putvar CFG_LLVM_SRC_DIR
17851757

17861758
for t in $CFG_HOST

0 commit comments

Comments
 (0)