From 90dbe285d6210146b9114b4fdb35ffc11cbad1ba Mon Sep 17 00:00:00 2001 From: Elnath Date: Fri, 18 Apr 2025 23:38:44 +0200 Subject: [PATCH] Easier way to choose which example program to debug --- build.rs | 3 ++- src/main.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index 3da1b16..54b0e7e 100644 --- a/build.rs +++ b/build.rs @@ -9,13 +9,14 @@ fn main() { Command::new("ld") .args(&[assembly_obj_path, "-o", assembly_exe_path]) .spawn().expect("linking failed"); + println!("cargo:rustc-env=ASM_PROG_PATH={}", assembly_exe_path); println!("cargo:rerun-if-changed=src/prog.nasm"); let c_exe_path = &format!("{}/cprog", std::env::var("OUT_DIR").unwrap()); Command::new("gcc") .args(&["-o", c_exe_path, "src/prog.c"]) .spawn().expect("C program compilation failed"); + println!("cargo:rustc-env=C_PROG_PATH={}", c_exe_path); println!("cargo:rerun-if-changed=src/prog.c"); - println!("cargo:rustc-env=TEST_PROG_PATH={}", assembly_exe_path); } diff --git a/src/main.rs b/src/main.rs index df8efb0..ccc92fb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -87,7 +87,7 @@ fn breakpoint_fun(child_pid: Pid) -> ExitCode { } fn main() -> ExitCode { - let child_exec_path = CString::new(env!("TEST_PROG_PATH")).unwrap(); + let child_exec_path = CString::new(env!("ASM_PROG_PATH")).unwrap(); match unsafe { fork() } { Ok(ForkResult::Child) => child::starti(child_exec_path),