summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-10-12 11:38:50 +0200
committerAndreas Kling <kling@serenityos.org>2020-10-12 19:53:25 +0200
commit75d5f436bc1863d0eb90af88b3f2c99e28d99f85 (patch)
tree805ef3c4fc4b7999cba44deaa68530c1cbb0376b
parentb82f2df4c8f135677f186e2133090d2ac97016c9 (diff)
downloadserenity-75d5f436bc1863d0eb90af88b3f2c99e28d99f85.zip
Toolchain: Upgrade to GCC 10.2.0
-rw-r--r--Documentation/UsingQtCreator.md2
-rw-r--r--Kernel/CMakeLists.txt8
-rw-r--r--Meta/CLion/CMakeLists.txt2
-rwxr-xr-xToolchain/BuildIt.sh4
4 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/UsingQtCreator.md b/Documentation/UsingQtCreator.md
index fc771a137a..c2d7e662c6 100644
--- 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
index c0c43d1384..529de517fe 100644
--- 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
index a15708ce35..f0161cc960 100644
--- 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
index 4051398c58..4237e8db86 100755
--- 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://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://ftp.gnu.org/gnu/gcc"