Skip to content

Commit

Permalink
config/toolchain: support ubuntu quantal
Browse files Browse the repository at this point in the history
  • Loading branch information
nickolaev committed Jul 26, 2012
1 parent 15af128 commit 2728aa2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions config/toolchain
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -377,15 +377,15 @@ cc_workaround () {
LSB_RELEASE=$(which lsb_release 2>/dev/null) || true LSB_RELEASE=$(which lsb_release 2>/dev/null) || true
if ! [ -z "$LSB_RELEASE" ]; then if ! [ -z "$LSB_RELEASE" ]; then
DISTRO=$(lsb_release -s -c) DISTRO=$(lsb_release -s -c)
if [ "$DISTRO" = oneiric -o "$DISTRO" = precise ]; then if [ "$DISTRO" = quantal -o "$DISTRO" = oneiric -o "$DISTRO" = precise ]; then
CC_VERSION=$($LOCAL_CC --version | head -n 1 | sed "s%gcc (.*) \([0-9]\.[0-9]\).*%\1%") CC_VERSION=$($LOCAL_CC --version | head -n 1 | sed "s%gcc (.*) \([0-9]\.[0-9]\).*%\1%")
if [ "$CC_VERSION" = 4.6 -o "$CC_VERSION" = 4.5 ]; then if [ "$CC_VERSION" = 4.7 -o "$CC_VERSION" = 4.6 -o "$CC_VERSION" = 4.5 ]; then
CC_44=$(which gcc-4.4) || true CC_44=$(which gcc-4.4) || true
[ -z "$CC_44" ] && cc_die gcc || export LOCAL_CC=$CC_44 [ -z "$CC_44" ] && cc_die gcc || export LOCAL_CC=$CC_44
fi fi


CXX_VERSION=$($LOCAL_CXX --version | head -n 1 | sed "s%g++ (.*) \([0-9]\.[0-9]\).*%\1%") CXX_VERSION=$($LOCAL_CXX --version | head -n 1 | sed "s%g++ (.*) \([0-9]\.[0-9]\).*%\1%")
if [ "$CXX_VERSION" = 4.6 -o "$CXX_VERSION" = 4.5 ]; then if [ "$CXX_VERSION" = 4.7 -o "$CXX_VERSION" = 4.6 -o "$CXX_VERSION" = 4.5 ]; then
CXX_44=$(which g++-4.4) || true CXX_44=$(which g++-4.4) || true
[ -z "$CXX_44" ] && cc_die g++ || export LOCAL_CXX=$CXX_44 [ -z "$CXX_44" ] && cc_die g++ || export LOCAL_CXX=$CXX_44
fi fi
Expand Down

0 comments on commit 2728aa2

Please sign in to comment.