denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove pseudo targets for building shared libs

Browse Source 
Thanks to the change "build: support library builds via lib/<libname>",
shared libraries can now be built directly by the build system.

Issue #4599
This commit is contained in:
Norman Feske
2022-09-01 13:12:13 +02:00
parent c560285d88
commit dd9e12601e
137 changed files with 94 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tool/run/boot_dir/fiasco
View File

@@ -21,7 +21,7 @@ proc run_boot_dir {binaries} {
set kernel_arg ""
set ld_arg ""
if {![file exists [run_dir]/genode/fiasco]} { set kernel_arg "kernel/fiasco" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld/fiasco" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld-fiasco" }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }

4
tool/run/boot_dir/foc
View File

@@ -65,7 +65,7 @@ proc run_boot_dir_x86 {binaries} {
set kernel_arg ""
set ld_arg ""
if {![file exists [run_dir]/genode/foc]} { set kernel_arg "kernel/foc" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld/foc" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld-foc" }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }
@@ -157,7 +157,7 @@ proc run_boot_dir_arm { binaries } {
global run_target
build { lib/ld/foc kernel/foc }
build { lib/ld-foc kernel/foc }
build_core_image $binaries

11
tool/run/boot_dir/linux
View File

@@ -10,11 +10,18 @@ proc run_boot_dir {binaries} {
set missing_boot_modules { }
foreach binary $binaries {
set src_binary_path "[pwd]/bin/[kernel_specific_binary $binary]"
set dst_binary "[kernel_specific_binary $binary]"
if {$dst_binary == "core-linux"} { set dst_binary "core" }
if {$dst_binary == "ld-linux.lib.so"} { set dst_binary "ld.lib.so" }
if {$dst_binary == "linux_timer_drv"} { set dst_binary "timer" }
if {[file exists $src_binary_path]} {
exec ln -sf $src_binary_path [run_dir]/genode/$binary
exec ln -sf $src_binary_path [run_dir]/genode/$dst_binary
} else {
lappend missing_boot_modules [kernel_specific_binary $binary]
lappend missing_boot_modules $binary
}
}
if {[llength $missing_boot_modules]} {

2
tool/run/boot_dir/nova
View File

@@ -37,7 +37,7 @@ proc run_boot_dir {binaries} {
set ld_arg ""
if {![file exists [run_dir]/genode/hypervisor]} { set kernel_arg kernel }
if {![file exists [run_dir]/genode/core-nova.a]} { set core_arg core/nova }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg lib/ld/nova }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg lib/ld-nova }
set targets "$kernel_arg $core_arg $ld_arg"
if {[llength $targets]} { build $targets }

2
tool/run/boot_dir/pistachio
View File

@@ -20,7 +20,7 @@ proc run_boot_dir {binaries} {
set kernel_arg ""
set ld_arg ""
if {![file exists [run_dir]/genode/pistachio]} { set kernel_arg "kernel/pistachio" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld/pistachio" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld-pistachio" }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }

2
tool/run/boot_dir/sel4
View File

@@ -33,7 +33,7 @@ proc run_boot_dir {binaries} {
set kernel_arg ""
set ld_arg ""
if {![file exists [run_dir]/genode/sel4]} { set kernel_arg "kernel/sel4" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld/sel4" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld-sel4" }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }