WE BUILD!

Author: ZelboK

crates/rustc_codegen_nvvm/src/back.rs

@@ -1,4 +1,4 @@
-use crate::llvm::{self, TargetMachine};
+use crate::llvm::{self, TargetMachine, MyTargetMachineError};
 use crate::override_fns::define_or_override_fn;
 use crate::{builder::Builder, context::CodegenCx, lto::ThinBuffer, LlvmMod, NvvmCodegenBackend};
 use cstr::cstr;
@@ -33,7 +33,7 @@ use std::{
 pub fn llvm_err(handler: &Handler, msg: &str) -> FatalError {
     match llvm::last_error() {
         Some(err) => handler.fatal(format!("{}: {}", msg, err)),
-        None => handler.fatal(msg),
+        None => handler.fatal(msg.to_string()),
     }
 }
 
@@ -122,8 +122,7 @@ pub fn target_machine_factory(
             )
         };
 
-        tm.ok_or_else(|| {
-            format!(
+        tm.ok_or_else(|| { format!(
                 "Could not create LLVM TargetMachine for triple: {}",
                 triple.to_str().unwrap()
             )

crates/rustc_codegen_nvvm/src/context.rs

@@ -176,7 +176,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
     }
 
     pub(crate) fn fatal(&self, msg: &str) -> ! {
-        self.tcx.sess.fatal(msg)
+        self.tcx.sess.fatal(msg.to_string())
     }
 
     // im lazy i know

crates/rustc_codegen_nvvm/src/lib.rs

@@ -175,7 +175,7 @@ impl WriteBackendMethods for NvvmCodegenBackend {
     type TargetMachine = &'static mut llvm::TargetMachine;
     type ThinData = ();
     type ThinBuffer = ThinBuffer;
-    type TargetMachineError = &'static mut llvm::MyTargetMachineError; // fix later 
+    type TargetMachineError = String; // fix later 
 
     fn run_link(
         _cgcx: &CodegenContext<Self>,