wash/rosetta
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: update kernel name references

Browse Source
This commit is contained in:
max 🍓
2026-05-30 10:14:38 +01:00
parent 87fe2d20ec
commit d879a37cb3
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,7 @@ check_pie_supported()
set(sys_dir ${CMAKE_CURRENT_BINARY_DIR}/sys) set(sys_dir ${CMAKE_CURRENT_BINARY_DIR}/sys)
set(kernel_name mango_kernel) set(kernel_name magenta_kernel)
set(bsp_name rosetta-system.bsp) set(bsp_name rosetta-system.bsp)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
arch/x86_64/Platform/Rosetta.cmake
+1 -1
View File
@@ -7,7 +7,7 @@ find_program(C_COMPILER x86_64-elf-gcc REQUIRED)
find_program(CXX_COMPILER x86_64-elf-g++ REQUIRED) find_program(CXX_COMPILER x86_64-elf-g++ REQUIRED)
#find_program(ASM_COMPILER x86_64-elf-as REQUIRED) #find_program(ASM_COMPILER x86_64-elf-as REQUIRED)
add_compile_definitions(__mango__=1 __rosetta__=1) add_compile_definitions(__magenta__=1 __rosetta__=1)
set(CMAKE_C_COMPILER ${C_COMPILER}) set(CMAKE_C_COMPILER ${C_COMPILER})
set(CMAKE_CXX_COMPILER ${CXX_COMPILER}) set(CMAKE_CXX_COMPILER ${CXX_COMPILER})
arch/x86_64/test/check-results
+1 -1
View File
@@ -16,7 +16,7 @@ def successful_boot(boot_log, out):
log(out, "Multiple kernel panics!") log(out, "Multiple kernel panics!")
return 1 return 1
nr_boots = boot_log.count('Mango kernel version') nr_boots = boot_log.count('Magenta kernel version')
if nr_boots == 0: if nr_boots == 0:
log(out, "Kernel didn't start!") log(out, "Kernel didn't start!")
return 1 return 1
services/herdd/CMakeLists.txt
+1 -1
View File
@@ -2,7 +2,7 @@ file(GLOB sources *.c)
add_executable(herdd ${sources}) add_executable(herdd ${sources})
target_link_libraries(herdd target_link_libraries(herdd
libc libc-runtime libc libc-runtime
libmango libpthread liblaunch librosetta libmagenta libpthread liblaunch librosetta
fx-core fx-ds fx-serial) fx-core fx-ds fx-serial)
sysroot_add_program( sysroot_add_program(
sys/bootstrap/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,7 @@ file(GLOB arch_sources arch/${CMAKE_SYSTEM_PROCESSOR}/*.S)
add_executable(bootstrap ${c_sources} ${arch_sources}) add_executable(bootstrap ${c_sources} ${arch_sources})
target_link_libraries(bootstrap target_link_libraries(bootstrap
libmango librosetta libmagenta librosetta
libc-core libc-malloc libc-pthread libc-core libc-malloc libc-pthread
libfs-static libfs-static
liblaunch-static liblaunch-static
sys/ld/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,7 @@ set_target_properties(ld PROPERTIES
SUFFIX ".so") SUFFIX ".so")
target_link_libraries(ld target_link_libraries(ld
libc-core libc-malloc libc-io libmango librosetta libxpc-static libc-core libc-malloc libc-io libmagenta librosetta libxpc-static
interface::fs) interface::fs)
target_compile_options(ld PRIVATE target_compile_options(ld PRIVATE