Mercurial > hg > Members > menikon > CbC_xv6

changeset 65:2fdcb0f953bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cp fs.img to CMAKE_SOURCE_DIR
author anatofuz
date Fri, 26 Jul 2019 18:46:36 +0900
parents 58c79e0c5101
children 101b229f182d
files src/gearsTools/pmake.pl src/usr/CMakeLists.txt
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gearsTools/pmake.pl	Fri Jul 26 18:25:02 2019 +0900
+++ b/src/gearsTools/pmake.pl	Fri Jul 26 18:46:36 2019 +0900
@@ -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 usr/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 fs.img\"","-DKERNEL_LINK_EXECUTABLE=\"$kernel_ld_command\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",@ARGV);
 
 system("make");
 #system("sh","link.sh");
--- a/src/usr/CMakeLists.txt	Fri Jul 26 18:25:02 2019 +0900
+++ b/src/usr/CMakeLists.txt	Fri Jul 26 18:46:36 2019 +0900
@@ -67,6 +67,6 @@
 endforeach(i)
 
 add_custom_target(fs.img ALL
-  COMMAND ../tools/mkfs fs.img ${_USR_COMMANDS} UNIX
+  COMMAND ../tools/mkfs fs.img ${_USR_COMMANDS} UNIX \; cp fs.img ${CMAKE_SOURCE_DIR}
   DEPENDS ${_USR_COMMANDS} mkfs
 )