Skip to content

M
mariadb
Commit 769eabaf authored by unknown's avatar unknown
Browse files
Options

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 

into msdesk.mysql.com:/home/magnus/mysql-5.0
parents 99c0dd3b c21dd5f1
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
configure.in
View file @ 769eabaf
...@@ -351,6 +351,15 @@ then ...@@ -351,6 +351,15 @@ then
if echo $CXX | grep gcc > /dev/null 2>&1 if echo $CXX | grep gcc > /dev/null 2>&1
then then
GCC_VERSION=`gcc -v 2>&1 | grep version | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'` GCC_VERSION=`gcc -v 2>&1 | grep version | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`
case $SYSTEM_TYPE in
*freebsd*)
# The libsupc++ library on freebsd with gcc 3.4.2 is dependent on
# libstdc++, disable it since other solution works fine
GCC_VERSION="NOSUPCPP_$GCC_VERSION"
;;
*)
;;
esac
echo "Using gcc version '$GCC_VERSION'" echo "Using gcc version '$GCC_VERSION'"
case "$GCC_VERSION" in case "$GCC_VERSION" in
3.4.*|3.5.*) 3.4.*|3.5.*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7