Merge branch 'main' into development

maxtyson123 · Jan 8, 2024 · 658849f · 658849f
2 parents e6f9b75 + 663c2d6
commit 658849f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
@@ -36,4 +36,4 @@ TARGET_LINK_OPTIONS(MaxOSk32 PRIVATE -T ${LINKER_SCRIPT} -nostdlib)
 TARGET_INCLUDE_DIRECTORIES(MaxOSk32 PRIVATE include)
 
 # Install kernel
-INSTALL(TARGETS MaxOSk32 DESTINATION ${CMAKE_SOURCE_DIR}/filesystem/boot)
+INSTALL(TARGETS MaxOSk32 DESTINATION ${CMAKE_SOURCE_DIR}/filesystem/boot)
diff --git a/toolchain/make_cross_compiler.sh b/toolchain/make_cross_compiler.sh
@@ -71,7 +71,6 @@ make install-target-libgcc    || fail "Installing libgcc failed"
 #  Leave the build directory
 cd ../../
 
-
 # Make a  build directory for cmake
 mkdir ../cmake-build