diff --git a/.vscode/settings.json b/.vscode/settings.json index 8ecaea8..78a7aff 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,5 +22,8 @@ "smp.h": "c", "string_view": "c", "lapic.h": "c" - } + }, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": true } \ No newline at end of file diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile index 6d3fcef..42c4f4e 100644 --- a/kernel/GNUmakefile +++ b/kernel/GNUmakefile @@ -15,8 +15,8 @@ ifneq ("$(wildcard $(CONFIG))","") include $(CONFIG) endif -CC := gcc -AS := gcc +CC := $(CONFIG_CC) +AS := $(CC) NASM := nasm ifeq ($(BUILD_MODE),) diff --git a/kernel/Kconfig b/kernel/Kconfig index af19094..61569c8 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -31,3 +31,9 @@ config ENABLE_FLANTERM bool "Enable Flanterm Support" help Includes support for the Flanterm terminal emulator. Useful for debugging real hardware. + +config CC + string "C Compiler" + default "gcc" + help + Path to the C compiler to use for building.