Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ jobs:
RUSTFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
# FIXME: use stable once rftrace supports stable
- uses: dtolnay/rust-toolchain@nightly
- uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-unknown-none
- run: cargo clippy --all-features
Expand Down Expand Up @@ -68,9 +67,11 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install uftrace
- uses: mkroening/rust-toolchain-toml@main
- uses: dtolnay/rust-toolchain@nightly
with:
components: llvm-tools
- name: Build
run: cargo +nightly rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
run: cargo rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
- name: Run
run: |
mkdir tracedir
Expand Down
4 changes: 2 additions & 2 deletions examples/c/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ default: out/debug/librftrace.a out/debug/librftrace_frontend_ffi.a
gcc main.c -p -pthread -ldl -lrftrace -lrftrace_frontend_ffi -Lout/debug/ -o test

out/debug/librftrace.a:
cargo +nightly build --manifest-path ../../rftrace/Cargo.toml --target-dir out
cargo build --manifest-path ../../rftrace/Cargo.toml --target-dir out

out/debug/librftrace_frontend_ffi.a:
cargo +nightly build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out
cargo build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out

clean:
rm -r out
Expand Down
6 changes: 0 additions & 6 deletions rftrace/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fn build_backend() {
let target = "x86_64-unknown-none";

let mut cmd = cargo();
cmd.arg("+nightly");
cmd.arg("rustc");

cmd.args(["--target", target]);
Expand All @@ -52,11 +51,6 @@ fn build_backend() {
cmd.stdout(Stdio::inherit());
cmd.stderr(Stdio::inherit());

cmd.args([
"-Zbuild-std=core",
"-Zbuild-std-features=compiler-builtins-mem",
]);

cmd.arg("--release");

cmd.arg("--");
Expand Down
3 changes: 1 addition & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[toolchain]
channel = "nightly"
components = [
"rust-src",
"llvm-tools-preview",
"rustfmt",
"clippy",
]
targets = ["x86_64-unknown-none"]