diff options
| author | Brian Gianforcaro <bgianf@serenityos.org> | 2021-04-27 00:25:02 -0700 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-04-27 13:07:04 +0200 |
| commit | 2ef93a3c0712c4e4d2dbb84ae8fa65b29b2b905b (patch) | |
| tree | e69c7b13aa5c39cb8e035aea7467c8217185344f /Kernel | |
| parent | 6652ce15a45c5860f130e3d24567b176dcd3c7fa (diff) | |
| download | serenity-2ef93a3c0712c4e4d2dbb84ae8fa65b29b2b905b.zip | |
Build: Use variables when concatenating Toolchain paths.
Make this stuff a bit easier to maintain by using the
root level variables to build up the Toolchain paths.
Also leave a note for future editors of BuildIt.sh to
give them warning about the other changes they'll need
to make.
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 3b9e4311ef..2445bf1111 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -349,12 +349,12 @@ 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.2.0/) + include_directories(/usr/local/include/c++/${GCC_VERSION}/) else() - include_directories(../Toolchain/Local/${SERENITY_ARCH}/Kernel/${SERENITY_ARCH}-pc-serenity/include/c++/10.3.0/) - include_directories(../Toolchain/Local/${SERENITY_ARCH}/Kernel/${SERENITY_ARCH}-pc-serenity/include/c++/10.3.0/${SERENITY_ARCH}-pc-serenity/) - link_directories(../Toolchain/Local/${SERENITY_ARCH}/Kernel/${SERENITY_ARCH}-pc-serenity/lib) - link_directories(../Toolchain/Local/${SERENITY_ARCH}/Kernel/lib/gcc/${SERENITY_ARCH}-pc-serenity/10.3.0/) + include_directories(${TOOLCHAIN_ROOT}/Kernel/${SERENITY_ARCH}-pc-serenity/include/c++/${GCC_VERSION}/) + include_directories(${TOOLCHAIN_ROOT}/Kernel/${SERENITY_ARCH}-pc-serenity/include/c++/${GCC_VERSION}/${SERENITY_ARCH}-pc-serenity/) + link_directories(${TOOLCHAIN_ROOT}/Kernel/${SERENITY_ARCH}-pc-serenity/lib) + link_directories(${TOOLCHAIN_ROOT}/Kernel/lib/gcc/${SERENITY_ARCH}-pc-serenity/${GCC_VERSION}/) endif() add_executable(Kernel ${SOURCES}) |