Skip to content

Commit d2e5845

Browse files
committed
---
yaml --- r: 231909 b: refs/heads/auto c: 254325c h: refs/heads/master i: 231907: 6d09936 v: v3
1 parent 558d421 commit d2e5845

File tree

6 files changed

+208
-2067
lines changed

6 files changed

+208
-2067
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 5c56887903bec6e1a638f8bdcfe2f22ec0fd000a
11+
refs/heads/auto: 254325cee0306e62735c0b69a9ff107b423ab544
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/configure

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -885,28 +885,6 @@ 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-
910888
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
911889
# system, so if we find that gcc is clang, we should just use clang directly.
912890
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
@@ -978,7 +956,7 @@ then
978956
LLVM_VERSION=$($LLVM_CONFIG --version)
979957

980958
case $LLVM_VERSION in
981-
(3.[5-8]*)
959+
(3.[5-7]*)
982960
msg "found ok version of LLVM: $LLVM_VERSION"
983961
;;
984962
(*)
@@ -1052,7 +1030,7 @@ then
10521030
esac
10531031
else
10541032
case $CFG_CLANG_VERSION in
1055-
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
1033+
(3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7*)
10561034
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
10571035
;;
10581036
(*)

0 commit comments

Comments
 (0)