Skip to content

Commit

Permalink
Merge pull request #606 from sched-ext/htejun/misc
Browse files Browse the repository at this point in the history
meson: Remove unused meson.build and add targeted builds for libs
  • Loading branch information
htejun authored Sep 4, 2024
2 parents 4513dfb + 708aaaa commit 161790f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 70 deletions.
21 changes: 14 additions & 7 deletions rust/meson.build
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
cargo_cmd = [cargo, 'build', '--manifest-path=@INPUT@', '--target-dir=@OUTDIR@',
cargo_build_args]

# the target to compile all rust binaries
custom_target('rust_binaries',
rust_libs = ['scx_utils', 'scx_stats', 'scx_rustland_core']
rust_bins = ['scx_loader']

cargo_bins_args = []

foreach bin : rust_bins
cargo_bins_args += ['-p', bin]
endforeach

# the default target to compile all rust binaries (but no libraries)
custom_target('rust_bins',
output: '@PLAINNAME@.__PHONY__',
input: 'Cargo.toml',
command: cargo_cmd,
command: cargo_cmd + cargo_bins_args,
env: cargo_env,
depends: sched_deps,
build_by_default: true,
build_always_stale: true)

# the target to compile loader binary
rust_binaries = ['scx_loader']

foreach binary: rust_binaries
# the target to compile individual packages
foreach binary: rust_libs + rust_bins
custom_target(binary,
output: binary + '@PLAINNAME@.__PHONY__',
input: 'Cargo.toml',
Expand Down
9 changes: 0 additions & 9 deletions scheds/rust/scx_bpfland/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_lavd/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_layered/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_mitosis/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_rlfifo/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_rustland/meson.build

This file was deleted.

9 changes: 0 additions & 9 deletions scheds/rust/scx_rusty/meson.build

This file was deleted.

0 comments on commit 161790f

Please sign in to comment.