diff src/usr/CMakeLists.txt @ 62:a28580a75faa

fix build fs.img
author anatofuz
date Thu, 25 Jul 2019 20:04:17 +0900
parents b3a3224e1823
children ab729eb8356b
line wrap: on
line diff
--- a/src/usr/CMakeLists.txt	Thu Jul 11 18:51:52 2019 +0900
+++ b/src/usr/CMakeLists.txt	Thu Jul 25 20:04:17 2019 +0900
@@ -8,6 +8,8 @@
 set(CMAKE_C_COMPILER "${CBC_COM}")
 
 include_directories("..")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdlib")
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LIB} -nostdlib")
 
 macro( GearsCommand )
     set( _OPTIONS_ARGS )
@@ -23,7 +25,7 @@
             add_custom_command (
                 OUTPUT    ${j}
                 DEPENDS   ${i}
-                COMMAND  "perl" "gearsTools/generate_stub.pl" "-o" ${j} ${i}
+                COMMAND  "perl" "../gearsTools/generate_stub.pl" "-o" ${j} ${i}
             )
             list(APPEND _Gears_CBC_SOURCES ${j})
         elseif (${i} MATCHES "\\.cu")
@@ -43,7 +45,7 @@
     add_custom_command (
           OUTPUT    c/${_Gears_TARGET}-context.c
           DEPENDS   ${_Gears_CBC_SOURCES}
-          COMMAND  "perl" "gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} ${_Gears_CBC_SOURCES}
+          COMMAND  "perl" "../gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} ${_Gears_CBC_SOURCES}
     )
     add_executable(${_Gears_TARGET} ${_Gears_CBC_SOURCES} ${_Gears_CSOURCES} c/${_Gears_TARGET}-context.c )
     target_link_libraries(${_Gears_TARGET} ulib)
@@ -52,14 +54,13 @@
 add_library(ulib STATIC  ulib.c usys.S printf.c umalloc.c)
 #add_library(syslib string.c)
 
-set(USRCOMMANDS cat echo grep init kill ln ls mkdir rm sh stressfs usertests wc zombie hello)
+set(USR_COMMANDS cat echo grep init kill ln ls mkdir rm sh stressfs usertests wc zombie hello)
 
 foreach(cmd ${USR_COMMANDS}) 
     GearsCommand (TARGET _${cmd} SOURCES ${cmd}.c) 
 endforeach(cmd)
 
-add_custom_command(OUTPUT fs.img
-  COMMAND ../tools/mkfs fs.img ${USR_COMMAND} UNIX
+add_custom_target(fs.img
+  COMMAND ../tools/mkfs fs.img ${USR_COMMANDS} UNIX
   DEPENDS ${USR_COMMANDS}
 )
-