Mercurial > hg > Members > anatofuz > CbC_xv6
changeset 64:58c79e0c5101
fix depend mkfs
| author | one |
|---|---|
| date | Fri, 26 Jul 2019 18:25:02 +0900 |
| parents | ab729eb8356b |
| children | 2fdcb0f953bb |
| files | src/CMakeLists.txt src/gearsTools/pmake.pl src/usr/CMakeLists.txt |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/CMakeLists.txt Fri Jul 26 17:20:50 2019 +0900 +++ b/src/CMakeLists.txt Fri Jul 26 18:25:02 2019 +0900 @@ -71,7 +71,7 @@ #target_link_libraries(syslib) add_custom_command ( OUTPUT c/${_Gears_TARGET}-context.c - DEPENDS ${_Gears_CBC_SOURCES} + DEPENDS ${_Gears_CBC_SOURCES} fs.img 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 )
--- a/src/gearsTools/pmake.pl Fri Jul 26 17:20:50 2019 +0900 +++ b/src/gearsTools/pmake.pl Fri Jul 26 18:25:02 2019 +0900 @@ -25,7 +25,7 @@ $cmake .= 3; $ldflags = " -L. -T kernel-cmake.ld"; $kernel_cflags = '-march=armv6 -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -Werror -I. -g -O0 -iquote ../ -c'; - # -DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf <OBJECTS> $libgcc -b binary initcode fs.img\" + # -DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf <OBJECTS> $libgcc -b binary initcode usr/fs.img\" $kernel_ld_flags = ' -L. -N -e main -Ttext 0 <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -L ../ /mnt/dalmore-home/one/src/gcc-arm-none-eabi-6-2017-q2-update/bin/../lib/gcc/arm-none-eabi/6.3.1/libgcc.a'; $kernel_ld_command = "$ld $kernel_ld_flags"; } @@ -33,7 +33,7 @@ $cflags =~ s/\n//g; create_link_script(); -print_exec_system($cmake, "-DGCC_LIB=$libgcc", "-DCBC_COM=$cc", "-DPMAKE_ARGS=\"$cflags\"","-DCMAKE_ASM_COMPILER=$cc","-DX_CMAKE_LINKER=$ld","-DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf <OBJECTS> $libgcc -b binary initcode fs.img\"","-DKERNEL_LINK_EXECUTABLE=\"$kernel_ld_command\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",@ARGV); +print_exec_system($cmake, "-DGCC_LIB=$libgcc", "-DCBC_COM=$cc", "-DPMAKE_ARGS=\"$cflags\"","-DCMAKE_ASM_COMPILER=$cc","-DX_CMAKE_LINKER=$ld","-DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf <OBJECTS> $libgcc -b binary initcode usr/fs.img\"","-DKERNEL_LINK_EXECUTABLE=\"$kernel_ld_command\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",@ARGV); system("make"); #system("sh","link.sh");