Mercurial > hg > CbC > CbC_xv6
diff src/gearsTools/pmake.pl @ 61:b3a3224e1823
fix link arguments...
author | anatofuz |
---|---|
date | Thu, 11 Jul 2019 18:51:52 +0900 |
parents | e5f099108a6e |
children | a28580a75faa |
line wrap: on
line diff
--- a/src/gearsTools/pmake.pl Thu Jul 11 16:12:16 2019 +0900 +++ b/src/gearsTools/pmake.pl Thu Jul 11 18:51:52 2019 +0900 @@ -23,15 +23,15 @@ chomp($libgcc = `$cc --print-libgcc-file-name`); $cflags .= " $libgcc"; $cmake .= 3; - $ldflags = " -L. -T kernel-cmake.ld $libgcc -b binary initcode fs.img"; + $ldflags = " -L. -T kernel-cmake.ld"; } $cflags =~ s/\n//g; create_link_script(); #cmake -DCMAKE_LINKER=/path/to/linker -DCMAKE_CXX_LINK_EXECUTABLE="<CMAKE_LINKER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" -print_exec_system($cmake, "-DCBC_COM=$cc", "-DPMAKE_ARGS=\"$cflags\"","-DCMAKE_ASM_COMPILER=$cc","-DCMAKE_LINKER=$ld","-DCMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags <OBJECTS> -o kernel.elf\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",'.'); +print_exec_system($cmake, "-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\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",'.'); system("make"); -system("sh","link.sh"); +#system("sh","link.sh"); sub create_link_script { my @link_script;