diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c4de99f07..1aa85da7f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,20 @@
 cmake_minimum_required(VERSION 3.26)
 
-set(BANAN_ARCH x86_64)
-
 if(DEFINED ENV{BANAN_ARCH})
 	set(BANAN_ARCH $ENV{BANAN_ARCH})
+else()
+	set(BANAN_ARCH x86_64)
 endif()
 
+set(TOOLCHAIN_PREFIX ${CMAKE_SOURCE_DIR}/toolchain/local)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_COMPILER ${BANAN_ARCH}-elf-g++)
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}/bin/${BANAN_ARCH}-banan_os-g++)
 set(CMAKE_CXX_COMPILER_WORKS True)
 
-if("${BANAN_ARCH}" STREQUAL "i386")
-	set(CMAKE_CXX_COMPILER i686-elf-g++)
+if(NOT EXISTS ${CMAKE_CXX_COMPILER})
+	set(CMAKE_CXX_COMPILER g++)
 endif()
 
 project(banan-os CXX)
@@ -21,7 +23,6 @@ set(BANAN_SYSROOT ${CMAKE_BINARY_DIR}/sysroot)
 set(BANAN_INCLUDE ${BANAN_SYSROOT}/usr/include)
 set(BANAN_BOOT ${BANAN_SYSROOT}/boot)
 set(DISK_IMAGE_PATH ${CMAKE_BINARY_DIR}/banan-os.img)
-set(TOOLCHAIN_PREFIX ${CMAKE_SOURCE_DIR}/toolchain/local)
 
 add_subdirectory(kernel)
 add_subdirectory(BAN)
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index f9ff2ce40d..6899af8e6a 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -150,3 +150,4 @@ add_custom_command(
 )
 
 set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_COMPILER} <CMAKE_CXX_LINK_FLAGS> <FLAGS> <LINK_FLAGS> -o <TARGET> ${CMAKE_CURRENT_BINARY_DIR}/crti.o ${CMAKE_CURRENT_BINARY_DIR}/crtbegin.o <OBJECTS> ${CMAKE_CURRENT_BINARY_DIR}/crtend.o ${CMAKE_CURRENT_BINARY_DIR}/crtn.o -lgcc ")
+