ya/ya-build
1
0
Fork 0
mirror of https://github.com/kp2pml30/ya-build.git synced 2026-02-17 08:24:41 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix realpath, separate -c

Browse source
This commit is contained in:
kp2pml30 2024-09-20 17:47:27 +04:00
parent 3dcb83edc5
commit 28091d07a0
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ya-build
View file

@ -367,7 +367,7 @@ rule CUSTOM_COMMAND
rule COMPILE_C rule COMPILE_C
depfile = $out.d depfile = $out.d
command = cd $ROOT_DIR && \ command = cd $ROOT_DIR && \
$CC -MD -MF $out.d $cflags -o $out -c "$$(realpath -s "--relative-to=$ROOT_DIR" "$in")" && \ $CC -MD -MF $out.d $cflags -o $out "$$(#{[RbConfig.ruby, Pathname.new(__FILE__).realpath, '__realpath_to_from'].map(&Shellwords.method(:escape)).join(' ')} "$in" "$ROOT_DIR")" && \
#{[RbConfig.ruby, Pathname.new(__FILE__).realpath, '__patch_dep'].map(&Shellwords.method(:escape)).join(' ')} $ROOT_DIR $out.d #{[RbConfig.ruby, Pathname.new(__FILE__).realpath, '__patch_dep'].map(&Shellwords.method(:escape)).join(' ')} $ROOT_DIR $out.d
rule LINK_C rule LINK_C
@ -585,9 +585,15 @@ def patch_dep()
File.write(dep, res) File.write(dep, res)
end end
def realpath_to_from
_, to, from = ARGV
puts Pathname.new(to).relative_path_from(from)
end
modes = { modes = {
'config' => method(:config), 'config' => method(:config),
'__patch_dep' => method(:patch_dep) '__patch_dep' => method(:patch_dep),
'__realpath_to_from' => method(:realpath_to_from)
} }
toExec = modes[ARGV[0]] toExec = modes[ARGV[0]]