From 5b4631dcf91a4942d0ec9b11e4b9d9845a3cd438 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 May 2021 21:21:01 +0200 Subject: [PATCH] Set min gcc version to 11 --- BUILDING.md | 12 ++++++------ CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 3cca437c47..b1c60c80a3 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -19,7 +19,7 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager. -* Clang 12+ or GCC 10+ +* Clang 12+ or GCC 11+ * [CMake 3.16.9+](https://www.cmake.org/download/) * [Qt 5.15.2](https://www.qt.io/download-qt-installer) * [Vulkan SDK 1.2.154+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) @@ -47,16 +47,16 @@ sudo apt-get install qt515base qt515svg . /opt/qt515/bin/qt515-env.sh >/dev/null 2>&1 ``` -##### GCC 10.x installation +##### GCC 11.x installation -If the `gcc-10` package is not available on your system, use the following commands +If the `gcc-11` package is not available on your system, use the following commands ``` sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update -sudo apt-get install gcc-10 g++-10 +sudo apt-get install gcc-11 g++-11 ``` -You can either use `update-alternatives` to setup `gcc-10`/`g++-10` as your default compilers or prefix any `cmake` command by `CXX=g++-10 CC=gcc-10 ` to use it. +You can either use `update-alternatives` to setup `gcc-11`/`g++-11` as your default compilers or prefix any `cmake` command by `CXX=g++-11 CC=gcc-11 ` to use it. ##### Vulkan SDK @@ -126,7 +126,7 @@ Afterwards: While still in the project root: 1) `cd .. && mkdir rpcs3_build && cd rpcs3_build` -2) `cmake ../rpcs3/ && make` or `CXX=g++-10 CC=gcc-10 cmake ../rpcs3/ && make` to force these compilers +2) `cmake ../rpcs3/ && make` or `CXX=g++-11 CC=gcc-11 cmake ../rpcs3/ && make` to force these compilers 3) Run RPCS3 with `./bin/rpcs3` When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`). diff --git a/CMakeLists.txt b/CMakeLists.txt index 53b6534b9d..310a8874db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.16.9) project(rpcs3) if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10) - message(FATAL_ERROR "RPCS3 requires at least gcc-10.") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11) + message(FATAL_ERROR "RPCS3 requires at least gcc-11.") endif() elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)