integrate rftrace into hermit-sys

- make sure that RUSTFLAGS is set correctly
hermit-os · Jan 31, 2021 · 997735f · 997735f
1 parent 40276a0
commit 997735f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/hermit-sys/Cargo.toml b/hermit-sys/Cargo.toml
@@ -56,5 +56,4 @@ features = ["std", "ethernet", "socket-udp", "socket-tcp", "proto-ipv4", "proto-
 [dependencies.rftrace]
 version = "0.1.0"
 optional = true
-features = ["autokernel", "buildcore", "interruptsafe"]
-
+features = ["autokernel", "buildcore", "interruptsafe"]
diff --git a/hermit-sys/build.rs b/hermit-sys/build.rs
@@ -88,6 +88,9 @@ fn build_hermit(src_dir: &Path, target_dir_opt: Option<&Path>) {
 	#[cfg(feature = "instrument")]
 	{
 		cmd.env("RUSTFLAGS", "-Z instrument-mcount");
+	}
+	#[cfg(not(feature = "instrument"))]
+	{
 		// if instrument is not set, ensure that instrument is not in environment variables!
 		cmd.env(
 			"RUSTFLAGS",

diff --git a/hermit-sys/src/lib.rs b/hermit-sys/src/lib.rs
@@ -2,6 +2,8 @@
 extern crate aarch64;
 #[macro_use]
 extern crate log;
+#[cfg(feature = "instrument")]
+extern crate rftrace;
 #[cfg(feature = "smoltcp")]
 extern crate smoltcp;
 #[cfg(target_arch = "x86_64")]