Skip to content

Commit 90af3dd

Browse files
committed
---
yaml --- r: 190203 b: refs/heads/tmp c: 49f7550 h: refs/heads/master i: 190201: cb922f7 190199: a57013e v: v3
1 parent a3772f9 commit 90af3dd

File tree

131 files changed

+1712
-1334
lines changed

Some content is hidden

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

131 files changed

+1712
-1334
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 905a611b94d1fd50f15cd06f27cd44fd4dacb131
37+
refs/heads/tmp: 49f7550a25722fbdb779eef80afa85f6d802f7e8
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3939
refs/tags/homu-tmp: d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf

branches/tmp/configure

Lines changed: 3 additions & 2 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
704705
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,8 +760,9 @@ 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"
763+
step_msg "on Bitrig, forcing use of clang, disabling jemalloc"
764764
CFG_ENABLE_CLANG=1
765+
CFG_ENABLE_JEMALLOC=0
765766
fi
766767

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

0 commit comments

Comments
 (0)