Skip to content

Commit acdc5c5

Browse files
committed
Enable -fPIC on non-bare-metal RISC-V
1 parent 661800e commit acdc5c5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/lib.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1365,11 +1365,11 @@ impl Build {
13651365
cmd.push_cc_arg("-ffunction-sections".into());
13661366
cmd.push_cc_arg("-fdata-sections".into());
13671367
}
1368-
// Disable generation of PIC on RISC-V for now: rust-lld doesn't support this yet
1369-
if self
1370-
.pic
1371-
.unwrap_or(!target.contains("windows-gnu") && !target.contains("riscv"))
1372-
{
1368+
// Disable generation of PIC on bare-metal RISC-V for now: rust-lld doesn't support this yet
1369+
if self.pic.unwrap_or(
1370+
!target.contains("windows-gnu")
1371+
&& !(target.contains("riscv") && target.contains("-none-")),
1372+
) {
13731373
cmd.push_cc_arg("-fPIC".into());
13741374
// PLT only applies if code is compiled with PIC support,
13751375
// and only for ELF targets.

0 commit comments

Comments
 (0)