Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-26 02:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-implement OSDK debugging fixes and other facilities upon the refactor

Browse Source 
This commit bring back the features introduced from d28292c to a52e432:
 - Disable KVM when using GDB;
 - Update docs about the GDB server address;
 - Add `config` option for `CargoArgs` in OSDK;
 - Ensure debug info added when debugging in the release profile.
This commit is contained in:
Zhang Junyang
2024-04-22 22:42:14 +08:00
committed by Tate, Hongliang Tian
parent f9ac2ee498
commit 56175f63df
13 changed files with 121 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osdk/src/commands/build/mod.rs
View File

@ -12,7 +12,7 @@ use std::{
use bin::strip_elf_for_qemu;
use super::util::{cargo, COMMON_CARGO_ARGS, DEFAULT_TARGET_RELPATH};
use super::util::{cargo, profile_name_adapter, COMMON_CARGO_ARGS, DEFAULT_TARGET_RELPATH};
use crate::{
arch::Arch,
base_crate::new_base_crate,
@ -153,6 +153,7 @@ pub fn do_build(
&build.profile,
&build.features[..],
build.no_default_features,
&build.override_configs[..],
&cargo_target_directory,
rustflags,
);
@ -186,6 +187,7 @@ fn build_kernel_elf(
profile: &str,
features: &[String],
no_default_features: bool,
override_configs: &[String],
cargo_target_directory: impl AsRef<Path>,
rustflags: &[&str],
) -> AsterBin {
@ -219,6 +221,9 @@ fn build_kernel_elf(
.arg(cargo_target_directory.as_ref());
command.args(COMMON_CARGO_ARGS);
command.arg("--profile=".to_string() + profile);
for override_config in override_configs {
command.arg("--config").arg(override_config);
}
info!("Building kernel ELF using command: {:#?}", command);
@ -228,13 +233,11 @@ fn build_kernel_elf(
process::exit(Errno::ExecuteCommand as _);
}
let aster_bin_path = cargo_target_directory.as_ref().join(&target_os_string);
let aster_bin_path = if profile == "dev" {
aster_bin_path.join("debug")
} else {
aster_bin_path.join(profile)
}
.join(get_current_crate_info().name);
let aster_bin_path = cargo_target_directory
.as_ref()
.join(&target_os_string)
.join(profile_name_adapter(profile))
.join(get_current_crate_info().name);
AsterBin::new(
aster_bin_path,