Skip to content

Commit 8b8122b

Browse files
authored
Fix CI for riscv64gc-unknown-linux-gnu (#816)
* Fix CI for riscv64gc-unknown-linux-gnu * Satisfy clippy
1 parent 6cd8ac8 commit 8b8122b

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

Cross.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ pre-build = [
1717
"apt install --assume-yes --install-recommends winehq-stable",
1818
]
1919

20+
[target.riscv64gc-unknown-linux-gnu.env]
21+
passthrough = [
22+
'AWS_LC_SYS_CFLAGS_riscv64gc_unknown_linux_gnu'
23+
]
24+
2025
[build.env]
2126
passthrough = [
2227
"AWS_LC_FIPS_SYS_EXTERNAL_BINDGEN",

aws-lc-fips-sys/builder/cmake_builder.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,20 @@ impl CmakeBuilder {
137137
emit_warning(
138138
"NOTICE: Build environment source paths might be visible in release binary.",
139139
);
140-
let parent_dir = self.manifest_dir.parent();
141-
if parent_dir.is_some() && (target_family() == "unix" || target_env() == "gnu") {
142-
let parent_dir = parent_dir.unwrap();
143-
144-
let flag = format!("\"-ffile-prefix-map={}=\"", parent_dir.display());
145-
if let Ok(true) = cc_build.is_flag_supported(&flag) {
146-
emit_warning(&format!("Using flag: {}", &flag));
147-
cmake_cfg.asmflag(&flag);
148-
cmake_cfg.cflag(&flag);
149-
} else {
150-
let flag = format!("\"-fdebug-prefix-map={}=\"", parent_dir.display());
140+
if let Some(parent_dir) = self.manifest_dir.parent() {
141+
if target_family() == "unix" || target_env() == "gnu" {
142+
let flag = format!("\"-ffile-prefix-map={}=\"", parent_dir.display());
151143
if let Ok(true) = cc_build.is_flag_supported(&flag) {
152144
emit_warning(&format!("Using flag: {}", &flag));
153145
cmake_cfg.asmflag(&flag);
154146
cmake_cfg.cflag(&flag);
147+
} else {
148+
let flag = format!("\"-fdebug-prefix-map={}=\"", parent_dir.display());
149+
if let Ok(true) = cc_build.is_flag_supported(&flag) {
150+
emit_warning(&format!("Using flag: {}", &flag));
151+
cmake_cfg.asmflag(&flag);
152+
cmake_cfg.cflag(&flag);
153+
}
155154
}
156155
}
157156
}

0 commit comments

Comments
 (0)