Skip to content

Commit d64244c

Browse files
committed
---
yaml --- r: 193711 b: refs/heads/beta c: e3656bd h: refs/heads/master i: 193709: 1cdc8e7 193707: b4c2173 193703: e9e49b9 193695: 6b3da05 v: v3
1 parent ba722f2 commit d64244c

File tree

135 files changed

+2135
-1713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+2135
-1713
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 8715a65496b557798a9ff346194991aea3581f4d
34+
refs/heads/beta: e3656bd81baa3c2cb5065da04f9debf378f99772
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/configure

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,8 @@ probe CFG_ADB adb
701701

702702
if [ ! -z "$CFG_PANDOC" ]
703703
then
704-
# Extract "MAJOR MINOR" from Pandoc's version number
705704
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
705+
# Extract "MAJOR MINOR" from Pandoc's version number
706706
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
707707

708708
MIN_PV_MAJOR="1"
@@ -760,9 +760,8 @@ fi
760760
# Force bitrig to build with clang; gcc doesn't like us there
761761
if [ $CFG_OSTYPE = unknown-bitrig ]
762762
then
763-
step_msg "on Bitrig, forcing use of clang, disabling jemalloc"
763+
step_msg "on Bitrig, forcing use of clang"
764764
CFG_ENABLE_CLANG=1
765-
CFG_ENABLE_JEMALLOC=0
766765
fi
767766

768767
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]

0 commit comments

Comments
 (0)