mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:57:46 +00:00
Build: Support non-i686 toolchains
* Add SERENITY_ARCH option to CMake for selecting the target toolchain * Port all build scripts but continue to use i686 * Update GitHub Actions cache to include BuildIt.sh
This commit is contained in:
parent
8ca0e8325a
commit
23b23cee5a
12 changed files with 43 additions and 202 deletions
|
@ -274,10 +274,10 @@ 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++/10.2.0/i686-pc-serenity/)
|
||||
include_directories(/usr/local/include/c++/10.2.0/${SERENITY_ARCH}-pc-serenity/)
|
||||
else()
|
||||
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/)
|
||||
include_directories(../Toolchain/Local/${SERENITY_ARCH}/${SERENITY_ARCH}-pc-serenity/include/c++/10.2.0/)
|
||||
include_directories(../Toolchain/Local/${SERENITY_ARCH}/${SERENITY_ARCH}-pc-serenity/include/c++/10.2.0/${SERENITY_ARCH}-pc-serenity/)
|
||||
endif()
|
||||
|
||||
add_executable(Kernel ${SOURCES})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue