From 058ecfe9973e502b09c9c2c5f2b9088ace8187e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20Umann?= <dkszelethus@gmail.com>
Date: Mon, 16 Oct 2023 15:07:17 +0200
Subject: [PATCH] g++ -> gcc

---
 .github/workflows/install-deps.sh | 4 ++--
 .github/workflows/pypi.yml        | 4 ++--
 config/package_layout.json        | 2 +-
 docs/README.md                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/install-deps.sh b/.github/workflows/install-deps.sh
index 37bf443384..c973acb960 100755
--- a/.github/workflows/install-deps.sh
+++ b/.github/workflows/install-deps.sh
@@ -2,7 +2,7 @@
 
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main' -y
-# Required for g++-13, as the latest LTS at the time of this change hasn't made it available.
+# Required for gcc-13, as the latest LTS at the time of this change hasn't made it available.
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 
 sudo apt-get update -q
@@ -22,4 +22,4 @@ sudo apt-get install \
 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 9999
 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 9999
 sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 9999
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 9999
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 9999
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 26836213a0..6e41b574bf 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -73,12 +73,12 @@ jobs:
       - name: "Install run-time dependencies (Linux)"
         if: ${{ matrix.os == 'ubuntu-20.04' }}
         run:
-          sudo apt-get update && sudo apt-get install g++-13 clang clang-tidy cppcheck
+          sudo apt-get update && sudo apt-get install gcc-13 clang clang-tidy cppcheck
 
       - name: "Install run-time dependencies (OSX)"
         if: ${{ matrix.os == 'macos-10.15' }}
         run:
-          brew install llvm cppcheck g++-13
+          brew install llvm cppcheck gcc-13
 
       - name: "Install run-time dependencies (Windows)"
         if: ${{ matrix.os == 'windows-2019' }}
diff --git a/config/package_layout.json b/config/package_layout.json
index 49579fe89b..92bda00c4d 100644
--- a/config/package_layout.json
+++ b/config/package_layout.json
@@ -4,7 +4,7 @@
       "clangsa": "clang",
       "clang-tidy": "clang-tidy",
       "cppcheck": "cppcheck",
-      "gcc": "g++"
+      "gcc": "gcc"
     },
     "clang-apply-replacements": "clang-apply-replacements"
   },
diff --git a/docs/README.md b/docs/README.md
index 2e6357e7e7..c9f5fcf4d3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -239,7 +239,7 @@ The following commands are used to bootstrap CodeChecker on Ubuntu 20.04 LTS:
 #       come from package manager!
 #       In case of Cppcheck, the minimal supported version is 1.80.
 #       In case of gcc, the minimal supported version is 13.0.0.
-sudo apt-get install clang clang-tidy cppcheck g++ build-essential curl
+sudo apt-get install clang clang-tidy cppcheck gcc build-essential curl
       gcc-multilib git python3-dev python3-venv python3-setuptools
 
 # Install nodejs dependency for web. In case of Debian/Ubuntu you can use the