Skip to content

Commit a3aa7d2

Browse files
committed
---
yaml --- r: 189957 b: refs/heads/master c: e3656bd h: refs/heads/master i: 189955: d768f6b v: v3
1 parent ebc4b7d commit a3aa7d2

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8715a65496b557798a9ff346194991aea3581f4d
2+
refs/heads/master: e3656bd81baa3c2cb5065da04f9debf378f99772
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
55
refs/heads/try: 1c28ab65017d74fc13d003f7c7a73d1a48e5406f

trunk/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)