Skip to content

Commit d6114bc

Browse files
committed
---
yaml --- r: 234492 b: refs/heads/tmp c: f6d6421 h: refs/heads/master v: v3
1 parent 0220cba commit d6114bc

File tree

5 files changed

+2067
-195
lines changed

5 files changed

+2067
-195
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 254325cee0306e62735c0b69a9ff107b423ab544
28+
refs/heads/tmp: f6d64219a4ef8133e5946bf174e5951281b06430
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/configure

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,28 @@ then
885885
CFG_DISABLE_JEMALLOC=1
886886
fi
887887

888+
# default gcc version under OpenBSD maybe too old, try using egcc, which is a
889+
# gcc version from ports
890+
if [ $CFG_OSTYPE = unknown-openbsd ]
891+
then
892+
if [ $("$CFG_GCC" --version 2>&1 | grep -c ' 4\.[0-6]') -ne 0 ]; then
893+
step_msg "older GCC found, try with egcc instead"
894+
895+
# probe again but using egcc
896+
probe CFG_GCC egcc
897+
898+
# and use egcc/eg++ for CC/CXX too if it was found
899+
# (but user setting has priority)
900+
if [ -n "$CFG_GCC" ]; then
901+
CC="${CC:-egcc}"
902+
CXX="${CXX:-eg++}"
903+
fi
904+
fi
905+
906+
step_msg "on OpenBSD, disabling jemalloc"
907+
CFG_DISABLE_JEMALLOC=1
908+
fi
909+
888910
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
889911
# system, so if we find that gcc is clang, we should just use clang directly.
890912
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
@@ -956,7 +978,7 @@ then
956978
LLVM_VERSION=$($LLVM_CONFIG --version)
957979

958980
case $LLVM_VERSION in
959-
(3.[5-7]*)
981+
(3.[5-8]*)
960982
msg "found ok version of LLVM: $LLVM_VERSION"
961983
;;
962984
(*)
@@ -1030,7 +1052,7 @@ then
10301052
esac
10311053
else
10321054
case $CFG_CLANG_VERSION in
1033-
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7*)
1055+
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
10341056
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
10351057
;;
10361058
(*)

0 commit comments

Comments
 (0)