RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:24:58 +00:00
Code Issues Activity Actions

Kernel: Make new kernel build process work on macOS

Browse source 
Use objcopy from the toolchain so that the changes introduced in
7236584 will succeed on macOS.

Fixes #8768.
This commit is contained in:
Gunnar Beutner 2021-07-15 18:17:58 +10:00 • committed by Gunnar Beutner
parent 3b5b7c5e65
commit e4f05a9046
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -167,6 +167,7 @@ else()
set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib) set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib)
set(CMAKE_STRIP ${TOOLCHAIN_PREFIX}strip) set(CMAKE_STRIP ${TOOLCHAIN_PREFIX}strip)
set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar) set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar)
set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy)
endif() endif()
foreach(lang ASM C CXX OBJC OBJCXX) foreach(lang ASM C CXX OBJC OBJCXX)

4
Kernel/CMakeLists.txt
View file

@ -413,9 +413,9 @@ add_dependencies(${KERNEL_TARGET} kernel_heap)
add_custom_command( add_custom_command(
TARGET ${KERNEL_TARGET} POST_BUILD TARGET ${KERNEL_TARGET} POST_BUILD
COMMAND ${TOOLCHAIN_PREFIX}objcopy -O elf32-i386 ${CMAKE_CURRENT_BINARY_DIR}/${KERNEL_TARGET} ${CMAKE_CURRENT_BINARY_DIR}/Kernel COMMAND ${CMAKE_OBJCOPY} -O elf32-i386 ${CMAKE_CURRENT_BINARY_DIR}/${KERNEL_TARGET} ${CMAKE_CURRENT_BINARY_DIR}/Kernel
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/embedmap.sh COMMAND ${CMAKE_COMMAND} -E env OBJCOPY=${CMAKE_OBJCOPY} sh ${CMAKE_CURRENT_SOURCE_DIR}/embedmap.sh
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Kernel ${CMAKE_CURRENT_BINARY_DIR}/kernel.map BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Kernel ${CMAKE_CURRENT_BINARY_DIR}/kernel.map
) )

3
Kernel/embedmap.sh
View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
tmp=$(mktemp) tmp=$(mktemp)
(cat kernel.map; printf '%b' '\0') > "$tmp" (cat kernel.map; printf '%b' '\0') > "$tmp"
objcopy --update-section .ksyms="$tmp" Kernel OBJCOPY="${OBJCOPY:-objcopy}"
"$OBJCOPY" --update-section .ksyms="$tmp" Kernel
rm -f "$tmp" rm -f "$tmp"