diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2021-03-21 16:53:07 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2021-03-21 16:53:07 +0200 |
commit | e9232199bdd97233dabd59f07c63607c93c0c59c (patch) | |
tree | 66aff19650079c9fc990f75d2ed390dd674cfdaa /makefile | |
parent | Add allocator (diff) | |
download | kernel.cpp-e9232199bdd97233dabd59f07c63607c93c0c59c.tar.xz |
Check multiboot2 header length, and if needed map the next page as well
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ CXX_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_OBJ)) CXX_DEP = $(CXX_OBJ:%.o=%.d) CXX_TEST_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_TEST_OBJ)) CXX_INCLUDE := $(addprefix -I, $(CXX_INCLUDE)) -CXX_SYSTEM_INCLUDE := $(addprefix -isystem, $(CXX_SYSTEM_INCLUDE)) +SYSTEM_INCLUDE := $(addprefix -isystem, $(SYSTEM_INCLUDE)) $(OBJ_DIR)/glitch.elf: $(autogen) $(AS_OBJ) $(CXX_OBJ) linker.ld @echo " LD $@" @@ -23,13 +23,13 @@ $(OBJ_DIR)/glitch.elf: $(autogen) $(AS_OBJ) $(CXX_OBJ) linker.ld $(AS_OBJ): $(OBJ_DIR)/%.o: %.S @mkdir -p $(@D) @echo " AS $<" - @$(AS) -target $(TARGET) -nostdlib -Wall -Wextra -c $^ -o $@ + @$(AS) -target $(TARGET) $(AS_FLAGS) $(SYSTEM_INCLUDE) -c $^ -o $@ -include $(CXX_DEP) $(CXX_OBJ): $(OBJ_DIR)/%.o : %.cc @mkdir -p $(@D) @echo " CXX $<" - @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(CXX_SYSTEM_INCLUDE) -MMD -c $< -o $@ + @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(SYSTEM_INCLUDE) -MMD -c $< -o $@ $(CXX_TEST_OBJ): $(OBJ_DIR)/%.o : %.cc @mkdir -p $(@D) |