From 9380b9db1f505e7148054375958e298ea7da24b8 Mon Sep 17 00:00:00 2001
From: xavisolesoft <xavisolesoft@gmail.com>
Date: Mon, 15 Apr 2024 14:58:00 +0100
Subject: [PATCH] Remove g++ toolchain

---
 CMake/Options.cmake       | 6 ------
 Ros2Native/CMakeLists.txt | 2 +-
 Setup.sh                  | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CMake/Options.cmake b/CMake/Options.cmake
index a19820a3e22..d5ac7337577 100644
--- a/CMake/Options.cmake
+++ b/CMake/Options.cmake
@@ -134,12 +134,6 @@ carla_string_option (
   /usr/bin/gcc-7
 )
 
-carla_string_option (
-  GXX_COMPILER
-  "g++ compiler used by some CARLA extensions."
-  /usr/bin/g++-7
-)
-
 
 
 # ================================
diff --git a/Ros2Native/CMakeLists.txt b/Ros2Native/CMakeLists.txt
index f068bc9e7f4..8b2e85342db 100644
--- a/Ros2Native/CMakeLists.txt
+++ b/Ros2Native/CMakeLists.txt
@@ -5,7 +5,7 @@ project(carla-ros2-native-project)
 include (ExternalProject)
 
 set (PROJECT_INSTALL_PATH ${CMAKE_CURRENT_BINARY_DIR}/install)
-set (PROJECT_CMAKE_FLAGS -DCMAKE_CXX_COMPILER=${GXX_COMPILER} -DCMAKE_C_COMPILER=${GCC_COMPILER} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE=-D_GLIBCXX_USE_CXX11_ABI=0 -DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH})
+set (PROJECT_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE=-D_GLIBCXX_USE_CXX11_ABI=0 -DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH})
 
 ExternalProject_add (
   foonathan_memory
diff --git a/Setup.sh b/Setup.sh
index 9826d9fc4a6..c98c764fb18 100644
--- a/Setup.sh
+++ b/Setup.sh
@@ -41,9 +41,8 @@ then
     sudo apt update
     sudo apt-get install retry
 fi
-retry --until=success --times=12 --delay=300 -- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu focal main universe"
 retry --until=success --times=12 --delay=300 -- sudo apt-get update
-retry --until=success --times=12 --delay=300 -- sudo apt-get install build-essential make g++-7 ninja-build libvulkan1 python3 python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl libtool rsync libxml2-dev git git-lfs
+retry --until=success --times=12 --delay=300 -- sudo apt-get install build-essential make ninja-build libvulkan1 python3 python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl libtool rsync libxml2-dev git git-lfs
 echo "Ubuntu Pacakges Installed..."
 
 echo "Installing Python Pacakges..."