diff src/CMakeLists.txt @ 61:b3a3224e1823

fix link arguments...
author anatofuz
date Thu, 11 Jul 2019 18:51:52 +0900
parents 8f435de13b91
children a28580a75faa
line wrap: on
line diff
--- a/src/CMakeLists.txt	Thu Jul 11 16:12:16 2019 +0900
+++ b/src/CMakeLists.txt	Thu Jul 11 18:51:52 2019 +0900
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 project(xv6cbc C ASM)
 add_subdirectory(tools)
+add_subdirectory(usr)
 
 
 set(USE_CUDA,0)
@@ -10,13 +11,11 @@
 # -DCMAKE_BUILD_TYPE=Debug
 set(CMAKE_C_FLAGS_DEBUG "-O0")
 add_definitions(${PMAKE_ARGS})
-set(CMAKE_C_COMPILER "${CBC_COM}")
 
 #add_custom_command(OUTPUT  tools
 #                   COMMAND "cd ${CMAKE_CURRENT_SOURCE_DIR}/tools && make run"
 #)
 #                   #WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools
-add_subdirectory(usr)
 
 
 if (${USE_CUDA})
@@ -32,8 +31,12 @@
 endif()
 
 include_directories(".")
+configure_file("${CMAKE_SOURCE_DIR}/kernel-cmake.ld" "${CMAKE_CURRENT_BINARY_DIR}/kernel-cmake.ld" COPYONLY)
 
 macro( GearsCommand )
+    set(CMAKE_C_COMPILER "${CBC_COM}")
+    set(CMAKE_LINKER "${X_CMAKE_LINKER}")
+    set(CMAKE_C_LINK_EXECUTABLE "${X_CMAKE_C_LINK_EXECUTABLE}")
     set( _OPTIONS_ARGS )
     set( _ONE_VALUE_ARGS TARGET )
     set( _MULTI_VALUE_ARGS SOURCES )
@@ -64,6 +67,7 @@
         endif()
     endforeach(i)
 
+    #target_link_libraries(syslib)
     add_custom_command (
           OUTPUT    c/${_Gears_TARGET}-context.c
           DEPENDS   ${_Gears_CBC_SOURCES}
@@ -78,8 +82,8 @@
   TARGET
       kernel
   SOURCES
-	lib/string.c arm.c asm.S bio.c buddy.c console.cbc exec.c file.cbc fs.c log.c main.c memide.c pipe.cbc proc.cbc spinlock.cbc
+	string.c arm.c asm.S bio.c buddy.c console.cbc exec.c file.cbc fs.c log.c main.c memide.c pipe.cbc proc.cbc spinlock.cbc 
 	start.c swtch.S syscall.cbc sysfile.cbc sysproc.c trap_asm.S trap.c vm.c device/picirq.c device/timer.c device/uart.c
-     lib/string.c    entry.S 
+         entry.S 
 )