FIXED

Author: PythonPlumber

.traerules

@@ -11,8 +11,21 @@ set(CMAKE_ASM_NASM_FLAGS "-f elf32")
 project(BasicallyLinux C ASM_NASM)
 
 # Toolchain configuration (can be overridden by command line)
-set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
-set(CMAKE_ASM_NASM_COMPILER nasm)
+if(NOT CMAKE_C_COMPILER)
+    find_program(C_COMPILER_I686 i686-linux-gnu-gcc)
+    find_program(C_COMPILER_ELF i686-elf-gcc)
+    if(C_COMPILER_I686)
+        set(CMAKE_C_COMPILER ${C_COMPILER_I686})
+    elseif(C_COMPILER_ELF)
+        set(CMAKE_C_COMPILER ${C_COMPILER_ELF})
+    else()
+        set(CMAKE_C_COMPILER gcc) # Fallback to system gcc
+    endif()
+endif()
+
+if(NOT CMAKE_ASM_NASM_COMPILER)
+    set(CMAKE_ASM_NASM_COMPILER nasm)
+endif()
 
 # Compilation flags for C files only
 add_compile_options(
@@ -33,8 +46,23 @@ add_compile_options(
 include_directories(include)
 
 # Source discovery
-file(GLOB_RECURSE ASM_SOURCES "src/*.asm")
-file(GLOB_RECURSE C_SOURCES "src/*.c")
+message(STATUS "Searching for sources in ${CMAKE_CURRENT_SOURCE_DIR}/src")
+file(GLOB_RECURSE ASM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.asm")
+file(GLOB_RECURSE C_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
+
+# Debugging: print found sources if they are empty
+if(NOT ASM_SOURCES AND NOT C_SOURCES)
+    message(WARNING "No source files found in ${CMAKE_CURRENT_SOURCE_DIR}/src. Trying relative path...")
+    file(GLOB_RECURSE ASM_SOURCES "src/*.asm")
+    file(GLOB_RECURSE C_SOURCES "src/*.c")
+endif()
+
+if(NOT ASM_SOURCES AND NOT C_SOURCES)
+    message(FATAL_ERROR "No source files found in any search path!")
+endif()
+
+message(STATUS "Found ${ASM_SOURCES} ASM files")
+message(STATUS "Found ${C_SOURCES} C files")
 
 # AI model blob handling
 set(MODEL_BLOB "${CMAKE_CURRENT_SOURCE_DIR}/model.bin")
@@ -54,10 +82,14 @@ if(EXISTS "${MODEL_BLOB}")
 else()
     message(WARNING "AI model blob not found. Kernel will be built without AI support.")
     set(MODEL_OBJ_PATH "")
+    add_compile_definitions(NO_AI_MODEL)
 endif()
 
 # Ensure boot.asm is ALWAYS FIRST in the link order to keep Multiboot header at the top
-set(BOOT_ASM "${CMAKE_CURRENT_SOURCE_DIR}/src/boot.asm")
+set(BOOT_ASM "${CMAKE_CURRENT_SOURCE_DIR}/src/arch/x86/boot.asm")
+if(NOT EXISTS "${BOOT_ASM}")
+    message(FATAL_ERROR "Could not find boot.asm at ${BOOT_ASM}")
+endif()
 list(REMOVE_ITEM ASM_SOURCES "${BOOT_ASM}")
 set(ASM_SOURCES "${BOOT_ASM}" ${ASM_SOURCES})
 

CMakeLists.txt

@@ -14,8 +14,13 @@
 #include "smp_rally.h"
 #include "sched.h"
 
+#ifndef NO_AI_MODEL
 extern uint8_t _ai_model_start;
 extern uint8_t _ai_model_end;
+#else
+static uint8_t _ai_model_start = 0;
+static uint8_t _ai_model_end = 0;
+#endif
 
 static uint8_t* ai_mapped_base = 0;
 static uint32_t ai_mapped_size = 0;