TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-10 21:14:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the link order

Browse Source
This commit is contained in:
Baptiste Wicht 2016-09-03 14:52:48 +02:00
parent e1b1fb3733
commit b581eb2fc6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/Makefile
View File

@ -8,9 +8,6 @@ THOR_FLAGS=-DCONFIG_HISTORY=y
CRTBEGIN_OBJ:=$(shell $(CXX) $(KERNEL_CPP_FLAGS_64) -print-file-name=crtbegin.o) CRTBEGIN_OBJ:=$(shell $(CXX) $(KERNEL_CPP_FLAGS_64) -print-file-name=crtbegin.o)
CRTEND_OBJ:=$(shell $(CXX) $(KERNEL_CPP_FLAGS_64) -print-file-name=crtend.o) CRTEND_OBJ:=$(shell $(CXX) $(KERNEL_CPP_FLAGS_64) -print-file-name=crtend.o)
# The link files provided by the compiler
SPECIAL_O_FILES=$(CRTBEGIN_OBJ) $(CRTEND_OBJ)
# Compile the 16-bit and 32-bit parts of the executable # Compile the 16-bit and 32-bit parts of the executable
boot_16.o: src/boot/boot_16.cpp boot_16.o: src/boot/boot_16.cpp
@ -50,7 +47,12 @@ $(eval $(call acpica_folder_compile,utilities))
-include $(D_FILES) -include $(D_FILES)
LINK_O_FILES=$(SPECIAL_O_FILES) $(O_FILES) # Remove special files from O_FILES
O_FILES := $(filter-out debug/src/crti.s.o,$(O_FILES))
O_FILES := $(filter-out debug/src/crtn.s.o,$(O_FILES))
# COmpute the link files order
LINK_O_FILES=debug/src/crti.s.o $(CRTBEGIN_OBJ) $(O_FILES) $(CRTEND_OBJ) debug/src/crtn.s.o
debug/kernel.bin: $(LINK_O_FILES) debug/kernel.bin: $(LINK_O_FILES)
@ mkdir -p debug/ @ mkdir -p debug/