Toolchain: Upgrade to GCC 10.2.0

cubiclove · Oct 12, 2020 · 75d5f43 · 75d5f43
1 parent b82f2df
commit 75d5f43
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Documentation/UsingQtCreator.md b/Documentation/UsingQtCreator.md
@@ -15,7 +15,7 @@ First, make sure you have a working toolchain and can build and run SerenityOS.
 * Edit the `serenity.config` file (In Qt Creator, hit ^K or CMD+K on a Mac to open the search dialog, type the name of the file and hit return to open it)
 * Add the following `#define`s to the file: `DEBUG`, `SANITIZE_PTRS`, and `KERNEL`. Depending on what you are working on, you need to have that last define commented out. If you're planning on working in the userland, comment out `#define KERNEL`. If you're working on the Kernel, then uncomment `#define KERNEL`.
 * Edit the `serenity.cxxflags` file to say `-std=c++2a -m32`
-* Edit the `serenity.includes` file, add the following lines: `.`, `..`, `../..`, `Services/`, `Libraries/`, `Libraries/LibC/`, `Libraries/LibPthread/`, `Libraries/LibM/`, `Toolchain/Local/i686-pc-serenity/include/c++/10.1.0`, `Build/Services/`, `Build/Libraries/`, `AK/`
+* Edit the `serenity.includes` file, add the following lines: `.`, `..`, `../..`, `Services/`, `Libraries/`, `Libraries/LibC/`, `Libraries/LibPthread/`, `Libraries/LibM/`, `Toolchain/Local/i686-pc-serenity/include/c++/10.2.0`, `Build/Services/`, `Build/Libraries/`, `AK/`
 
 Qt Creator should be set up correctly now, go ahead and explore the project and try making changes. Have fun! :^)
 

diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
@@ -259,11 +259,11 @@ add_library(kernel_heap STATIC ${KERNEL_HEAP_SOURCES})
 file(GENERATE OUTPUT linker.ld INPUT linker.ld)
 
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES SerenityOS)
- include_directories(/usr/local/include/c++/10.1.0/)
- include_directories(/usr/local/include/c++/10.1.0/i686-pc-serenity/)
+ include_directories(/usr/local/include/c++/10.2.0/)
+ include_directories(/usr/local/include/c++/10.2.0/i686-pc-serenity/)
 else()
- include_directories(../Toolchain/Local/i686-pc-serenity/include/c++/10.1.0/)
- include_directories(../Toolchain/Local/i686-pc-serenity/include/c++/10.1.0/i686-pc-serenity/)
+ include_directories(../Toolchain/Local/i686-pc-serenity/include/c++/10.2.0/)
+ include_directories(../Toolchain/Local/i686-pc-serenity/include/c++/10.2.0/i686-pc-serenity/)
 endif()
 
 add_executable(Kernel ${SOURCES})

diff --git a/Meta/CLion/CMakeLists.txt b/Meta/CLion/CMakeLists.txt
@@ -26,7 +26,7 @@ set(INCLUDE_DIRS
  "serenity/Libraries/LibPthread"
  "serenity/Libraries/LibM"
  "serenity/Services"
- "serenity/Toolchain/Local/i686-pc-serenity/include/c++/10.1.0"
+ "serenity/Toolchain/Local/i686-pc-serenity/include/c++/10.2.0"
  "serenity/Build/Services"
  "serenity/Build/Libraries")
 

diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh
@@ -64,8 +64,8 @@ BINUTILS_NAME="binutils-$BINUTILS_VERSION"
 BINUTILS_PKG="${BINUTILS_NAME}.tar.gz"
 BINUTILS_BASE_URL="http:https://ftp.gnu.org/gnu/binutils"
 
-GCC_VERSION="10.1.0"
-GCC_MD5SUM="8a9fbd7e24d04c5d36e96bc894d3cd6b"
+GCC_VERSION="10.2.0"
+GCC_MD5SUM="941a8674ea2eeb33f5c30ecf08124874"
 GCC_NAME="gcc-$GCC_VERSION"
 GCC_PKG="${GCC_NAME}.tar.gz"
 GCC_BASE_URL="http:https://ftp.gnu.org/gnu/gcc"