Enable -fPIC on non-bare-metal RISC-V

rust-lang · Dec 5, 2019 · eaab26a · eaab26a
1 parent 661800e
commit eaab26a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1366,10 +1366,10 @@ impl Build {
                     cmd.push_cc_arg("-fdata-sections".into());
                 }
                 // Disable generation of PIC on RISC-V for now: rust-lld doesn't support this yet
-                if self
-                    .pic
-                    .unwrap_or(!target.contains("windows-gnu") && !target.contains("riscv"))
-                {
+                if self.pic.unwrap_or(
+                    !target.contains("windows-gnu")
+                        && !(target.contains("riscv") && target.contains("-none")),
+                ) {
                     cmd.push_cc_arg("-fPIC".into());
                     // PLT only applies if code is compiled with PIC support,
                     // and only for ELF targets.