Skip to content

Commit

Permalink
Build gcc6 (#6660)
Browse files Browse the repository at this point in the history
#changelog #ci
  • Loading branch information
ofTheo authored Jan 13, 2021
1 parent 6ca04be commit b2c18fe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/ci/linux64/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ROOT=${TRAVIS_BUILD_DIR:-"$( cd "$(dirname "$0")/../../.." ; pwd -P )"}
# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56746#c7
# the "proper" way does not work currently:
#export CXXFLAGS="$(CXXFLAGS) --param ftrack-macro-expansion=0"
CUSTOMFLAGS="-ftrack-macro-expansion=0"
CUSTOMFLAGS="-ftrack-macro-expansion=0 -fpic"

source $ROOT/scripts/ci/ccache.sh

Expand Down
7 changes: 7 additions & 0 deletions scripts/ci/linux64/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ sudo $OF_ROOT/scripts/linux/ubuntu/install_dependencies.sh -y;
#sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
#sudo apt-get install gcc-4.9 g++-4.9

sudo add-apt-repository -y ppa:dns/gnu
echo deb http://ci.openframeworks.cc/gcc_repo trusty main | sudo tee /etc/apt/sources.list.d/of_gcc_repo.list
sudo apt-get update -q
sudo apt-get install -y --allow-unauthenticated gcc-6 g++-6
sudo apt-get install -y gperf coreutils realpath libxrandr-dev libxinerama-dev libx11-dev libxcursor-dev libxi-dev
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 100
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 100
g++ -v

if [ "$OPT" = "qbs" ] && [ ! -d "$TRAVIS_BUILD_DIR/linuxbrew/.linuxbrew" ]; then
Expand Down

0 comments on commit b2c18fe

Please sign in to comment.