summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-03-11 13:05:59 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-03-11 13:05:59 -0700
commitaf30bb8316849e96fca2764738d0d3e0060c9be7 (patch)
tree3e52da7b66409f5a7c174702ba023482c922ee5a
parent7c6fac94ecaacbd18e94734503d274641ebdf2f1 (diff)
downloadtmwa-af30bb8316849e96fca2764738d0d3e0060c9be7.tar.gz
tmwa-af30bb8316849e96fca2764738d0d3e0060c9be7.tar.bz2
tmwa-af30bb8316849e96fca2764738d0d3e0060c9be7.tar.xz
tmwa-af30bb8316849e96fca2764738d0d3e0060c9be7.zip
Fix travis deps for undocumented change to amd64
-rw-r--r--.travis.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d0140b1..7c1c3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,6 @@ notifications:
on_failure: always
## Are we going to want this on or off?
irc:
- # TMW irc doesn't work for some reason; freenode does ...
- # I'm leaving it like this because it's what I'd like to use.
channels: "chat.freenode.net#tmwa"
on_success: always
on_failure: always
@@ -31,7 +29,13 @@ install:
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test &&
sudo apt-get update -qq;
fi
- - sudo apt-get install -qq ${REAL_CXX}
+ -
+ if [ "${REAL_CXX}" = "clang++" ];
+ then
+ sudo apt-get install -qq ${REAL_CXX} g++-multilib;
+ else
+ sudo apt-get install -qq ${REAL_CXX}-multilib;
+ fi
## Do something before the main test script
# before_script: ...