diff options
| author | Marvin Borner | 2020-04-25 22:33:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-25 22:33:57 +0200 |
| commit | f2175ab40a977d15526e7ebc3ad327e3ef825069 (patch) | |
| tree | 5cfa998facc0280624ae54d61506305d25d5b8f8 /CMakeLists.txt | |
| parent | cc9323db37e5aa33caddeddc625380a46783d510 (diff) | |
Some work on the elf loader
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cf3ba4..14436e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,11 +55,7 @@ add_custom_command( add_executable(user ${user_sources}) target_include_directories(user PUBLIC "src/userspace/") set_target_properties(user PROPERTIES OUTPUT_NAME "${CMAKE_CURRENT_SOURCE_DIR}/build/user.o") -add_custom_command( - TARGET user POST_BUILD - COMMAND cross/opt/bin/i686-elf-objcopy -O binary build/user.o build/user.bin - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -) - +target_link_libraries(kernel PRIVATE "-T ${CMAKE_CURRENT_SOURCE_DIR}/src/userspace/linker.ld") + # Dependencies add_dependencies(kernel resources user) |