From 886cd0a18d8b6e83243090ee77abd1a901c47ff5 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Thu, 19 May 2022 22:22:50 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Allow=20executing=20gdb?= =?UTF-8?q?=20from=20cargo-make?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was failing before because no tty was available. --- bin/chainboot/Makefile.toml | 2 +- nucleus/Makefile.toml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/chainboot/Makefile.toml b/bin/chainboot/Makefile.toml index 5070858..c4caa8d 100644 --- a/bin/chainboot/Makefile.toml +++ b/bin/chainboot/Makefile.toml @@ -44,7 +44,7 @@ disabled = true dependencies = ["build", "kernel-binary", "gdb-config"] env = { "RUST_GDB" = "${GDB}" } script = [ - "rust-gdb -x ${GDB_CONNECT_FILE} ${CHAINBOOT_ELF}" + "exec < /dev/tty && rust-gdb -x ${GDB_CONNECT_FILE} ${CHAINBOOT_ELF}" ] [tasks.sdcard] diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml index 6779125..3e2fad7 100644 --- a/nucleus/Makefile.toml +++ b/nucleus/Makefile.toml @@ -44,12 +44,11 @@ script = [ ''' ] -# Problem: this eats STDIN! need to run in subshell or sth [tasks.gdb] dependencies = ["build", "kernel-binary", "gdb-config"] env = { "RUST_GDB" = "${GDB}" } script = [ - "rust-gdb -x ${GDB_CONNECT_FILE} ${KERNEL_ELF}" + "exec < /dev/tty && rust-gdb -x ${GDB_CONNECT_FILE} ${KERNEL_ELF}" ] [tasks.gdb-cb]