Correct CRTXBUNDLE static targets into separate objectscmake

This correct refers to a wrong order of linking CRT objects.
When targets are separates into 4: CRTI, CRTBEGIN, CRTEND, CRTN
    the order became a little bit correct.

TODO
- Image with grub bootloader creation
- Build under window platform (optional)

Signed-off-by: Alexey Gavrilov <alexey.gavrilov@mail.com>

2 files changed, 18 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cd67be..6173245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,11 +107,13 @@ target_sources(Objective PRIVATE
 )
 
 target_link_libraries(Objective PRIVATE
-    CRTI
+    $<TARGET_OBJECTS:CRTI>
+    $<TARGET_OBJECTS:CRTBEGIN>
     Architecture
     Kernel
     Drivers
-    CRTN
+    $<TARGET_OBJECTS:CRTEND>
+    $<TARGET_OBJECTS:CRTN>
 )
 
 # Set cxx linker options
diff --git a/libgcc/x86/CMakeLists.txt b/libgcc/x86/CMakeLists.txt
index 8b2eb67..8dac6ba 100644
--- a/libgcc/x86/CMakeLists.txt
+++ b/libgcc/x86/CMakeLists.txt
@@ -1,21 +1,20 @@
-add_library(CRTI INTERFACE)
-add_library(CRTIBUNDLE STATIC)
-target_sources(CRTIBUNDLE PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/crti.nasm
-    $<TARGET_OBJECTS:CRTBEGIN>
+add_library(CRTI OBJECT)
+target_sources(CRTI PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/crti.nasm
 )
-target_link_libraries(CRTIBUNDLE PUBLIC
-    ASM_NASM_COMPILER_REQUIREMENTS 
+
+target_link_libraries(CRTI
+    PUBLIC
+        ASM_NASM_COMPILER_REQUIREMENTS 
 )
-target_link_libraries(CRTI INTERFACE CRTIBUNDLE)
 
-add_library(CRTN INTERFACE)
-add_library(CRTNBUNDLE STATIC)
-target_sources(CRTNBUNDLE PRIVATE
+add_library(CRTN OBJECT)
+target_sources(CRTN PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/crtn.nasm
-    $<TARGET_OBJECTS:CRTEND>
 )
-target_link_libraries(CRTNBUNDLE PUBLIC
-    ASM_NASM_COMPILER_REQUIREMENTS
+
+target_link_libraries(CRTN
+    PUBLIC
+        ASM_NASM_COMPILER_REQUIREMENTS
+
 )
-target_link_libraries(CRTN INTERFACE CRTNBUNDLE)