Skip to content

Commit

Permalink
Merge pull request #1622 from Expensify/cole_gcc13_migration
Browse files Browse the repository at this point in the history
Update bedrock to gcc 13 compiler
  • Loading branch information
tylerkaraszewski authored Dec 7, 2023
2 parents 6db5ec1 + 818fff6 commit 17af25a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
env:
global:
- CXX=g++-9 CC=gcc-9
- CXX=g++-13 CC=gcc-13
- secure: gIOAWHsP6BaQgQc/IBEqdcyzMepMQFoKL4BzFwysbTcX3yIT3k5iSHpoCH/+RuHOB8XZl+xOwbOyuV+ujgbb70WB1ycYiQRhYZiX1kdmjodbbqgh9ZbGYajN62sI0JrTin4mGFnTwNJ0g1nuneuqIh0z5bszu+fcbfrqmaYkxO3cKUhyPp1jl7iAFmqkhnnLmXsi0N7d3yn1rLYfEfya9e4LOAC4pKPJUJzrs7vcavRVuFOAL3Lg+DyDsbBHy330SZEERUyX5Jb44nVJ3j9XGrujnPhlwan8wye9vrCrtRhC1lo2cllV9m0oSboJsV9A+bMQ2kgFqjZTMyZyjsQrflYNYhLpiFp3qVCTHpGH7jS6pUOXzRn/T+BUns4/4RJE5EsDzgBOg90oBVNGU++zJjCGMRaOp2LJt7uSCSc8kHEzfgvbcaGI9CPSlZLILVcrifUCNzktbEtQXEJ7SAtsSDI8sbxtBKvL0wExxx8FpKSY4yvRU7xfMhumzU4Ngufz3521MyZkYsOJVE02N/D+jzHRTjGRypatm9QfHeQmRuawT+aZ/Vra9jVTBelFkibshXAiVAm8kkAq4xz9Pml31+nsNUIo9rwfzyPdLAx8qV31EFmf55zggHu0LuEO1mp46y82oPakO6BxVdRtAUnZogagMWflant/KqRlzRsQt/M=
notifications:
email:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# to be set, but for the time being we need to override the defaults so that our existing dev environment works. This
# can be removed when that is resolved.
ifeq ($(CC),cc)
CC = gcc-9
CC = gcc-13
endif
ifeq ($(CXX),g++)
CXX = g++-9
CXX = g++-13
endif

# Set the optimization level from the environment, or default to -O2.
Expand Down
8 changes: 4 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ You can build from scratch as follows:
# Install some dependencies
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install build-essential gcc-9 g++-9 libpcre++-dev zlib1g-dev
sudo apt-get install build-essential gcc-13 g++-13 libpcre++-dev zlib1g-dev

# Build it
cd Bedrock
Expand Down Expand Up @@ -73,16 +73,16 @@ You can build from scratch as follows:

# Install some dependencies with Brew (see: https://brew.sh/)
brew update
brew install gcc@6
brew install gcc@13

# Configure PCRE to use C++17 and compile from source
brew uninstall --ignore-dependencies pcre
brew edit pcre
# Add these to the end of the `system "./configure"` command:
# "--enable-cpp",
# "--enable-pcre64",
# "CXX=/usr/local/bin/g++-9",
# "CXXFLAGS=--std=gnu++14"
# "CXX=/usr/local/bin/g++-13",
# "CXXFLAGS=--std=gnu++17"
brew install --build-from-source pcre

# Build it
Expand Down
2 changes: 1 addition & 1 deletion test/clustertest/tests/ClusterUpgradeTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct ClusterUpgradeTest : tpunit::TestFixture {
ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && git checkout " + bedrockTagName + " > /dev/null").c_str()));

// Build the release.
ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && CXX=g++-9 CC=gcc-9 make -j8 > /dev/null").c_str()));
ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && CXX=g++-13 CC=gcc-13 make -j8 > /dev/null").c_str()));

// Save the final product.
mkdir(prodBedrockDirName.c_str(), 0755);
Expand Down
6 changes: 3 additions & 3 deletions travis.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -e

export CXX=g++-9
export CC=gcc-9
export CXX=g++-13
export CC=gcc-13

# Add the current working directory to $PATH so that tests can find bedrock.
export PATH=$PATH:`pwd`
Expand Down Expand Up @@ -72,7 +72,7 @@ else
fi

sudo apt-get update -y
sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install gcc-9 g++-9
sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install gcc-13 g++-13

travis_time_finish
travis_fold end build_bedrock
Expand Down

0 comments on commit 17af25a

Please sign in to comment.