From 224924885d7464302673af31159e2b85c8822782 Mon Sep 17 00:00:00 2001 From: Cyber Gsus Date: Wed, 22 Jun 2022 20:42:36 +0200 Subject: [PATCH] Documentation: Bump compiler version to `12.1.0` in include paths Even though we tell the user to change the version manually if it doesn't match with the current `Toolchain/Local/i686/i686-pc-serenity/include/XX.X.X` version, it doesn't hurt to update it properly now that versions differ by major version. --- Documentation/EmacsConfiguration.md | 6 +++--- Documentation/UsingQtCreator.md | 2 +- Documentation/VSCodeConfiguration.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/EmacsConfiguration.md b/Documentation/EmacsConfiguration.md index d0281ff216..bcf9d2afc8 100644 --- a/Documentation/EmacsConfiguration.md +++ b/Documentation/EmacsConfiguration.md @@ -13,11 +13,11 @@ CompileFlags: Add: - "-D__serenity__" - "-UNO_TLS" - - "-I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/11.2.0" - - "-I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/11.2.0/i686-pc-serenity" + - "-I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0" + - "-I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0/i686-pc-serenity" ``` -You will need to change `/path/to/serenity` and change `11.2.0` to +You will need to change `/path/to/serenity` and change `12.1.0` to whatever your GCC toolchain version at the time is. Run cmake (`Meta/serenity.sh run` or similar) at least once for this diff --git a/Documentation/UsingQtCreator.md b/Documentation/UsingQtCreator.md index 40662d2743..d1f548cbd4 100644 --- a/Documentation/UsingQtCreator.md +++ b/Documentation/UsingQtCreator.md @@ -26,7 +26,7 @@ Userland/Libraries/LibC/ Userland/Libraries/LibM/ Userland/Libraries/LibPthread/ Userland/Libraries/LibSystem/ -Toolchain/Local/i686/i686-pc-serenity/include/c++/11.2.0 +Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0 Build/i686/ Build/i686/Userland/ Build/i686/Userland/Services/ diff --git a/Documentation/VSCodeConfiguration.md b/Documentation/VSCodeConfiguration.md index 928f4d53c6..0d6dc3a229 100644 --- a/Documentation/VSCodeConfiguration.md +++ b/Documentation/VSCodeConfiguration.md @@ -14,11 +14,11 @@ The official clangd extension can be used for C++ comprehension. It is recommend ```yaml CompileFlags: - Add: [-D__serenity__, -I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/11.2.0, -I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/11.2.0/i686-pc-serenity] + Add: [-D__serenity__, -I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0, -I/path/to/serenity/Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0/i686-pc-serenity] CompilationDatabase: Build/i686 ``` -You only need the `Add:` line if you're using GCC. Run cmake at least once for this to work. There's some configuring to do for the include paths: First, replace `/path/to/serenity` with the actual path to the Serenity source folder. Then, you should replace the toolchain subdirectory and target triple architecture, here `i686`, with the one you're compiling most often. And finally, the compiler version (`11.2.0`) might need to be updated in the future. Just look in the `c++` parent folder and see what's currently there. +You only need the `Add:` line if you're using GCC. Run cmake at least once for this to work. There's some configuring to do for the include paths: First, replace `/path/to/serenity` with the actual path to the Serenity source folder. Then, you should replace the toolchain subdirectory and target triple architecture, here `i686`, with the one you're compiling most often. And finally, the compiler version (`12.1.0`) might need to be updated in the future. Just look in the `c++` parent folder and see what's currently there. A known issue with clangd in general is that it likes to crash. You can usually just restart it via the command palette. If that doesn't help, close currently open C++ files and/or switch branches before restarting, which helps sometimes.