Merge remote-tracking branch 'origin/master'

Author: RDambrosio016

crates/optix_sys/build.rs

@@ -8,22 +8,23 @@ use std::env;
 // to a lib and link it in so that we have the initialization and C function logic.
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
-    let mut header = find_optix_root().expect(
+    let mut optix_include = find_optix_root().expect(
         "Unable to find the OptiX SDK, make sure you installed it and
     that OPTIX_ROOT or OPTIX_ROOT_DIR are set",
     );
-    header = header.join("include");
-    let cuda_dir = find_cuda_root()
-        .expect(
-            "Unable to find the CUDA SDK, make sure you 
-    installed it and that CUDA_ROOT is set",
-        )
-        .join("include");
+
+    optix_include = optix_include.join("include");
+
+    let mut cuda_include = find_cuda_root().expect(
+        "Unable to find the CUDA Toolkit, make sure you installed it and
+    that CUDA_ROOT, CUDA_PATH or CUDA_TOOLKIT_ROOT_DIR are set",
+    );
+    cuda_include = cuda_include.join("include");
 
     cc::Build::new()
         .file("./optix_stubs.c")
-        .include(cuda_dir)
-        .include(header)
+        .include(optix_include)
+        .include(cuda_include)
         .cpp(false)
         .compile("optix_stubs");
 

crates/rustc_codegen_nvvm/build.rs

@@ -166,6 +166,16 @@ fn rustc_llvm_build() {
         if flag.starts_with("-flto") {
             continue;
         }
+        // ignore flags that aren't supported in gcc 8
+        if flag == "-Wcovered-switch-default" {
+            continue;
+        }
+        if flag == "-Wstring-conversion" {
+            continue;
+        }
+        if flag == "-Werror=unguarded-availability-new" {
+            continue;
+        }
 
         cfg.flag(flag);
     }
@@ -183,7 +193,7 @@ fn rustc_llvm_build() {
     build_helper::rerun_if_changed(Path::new("rustc_llvm_wrapper"));
     cfg.file("rustc_llvm_wrapper/RustWrapper.cpp")
         .file("rustc_llvm_wrapper/PassWrapper.cpp")
-        .include("rustc_llvm_wrapper/rustllvm.h")
+        .include("rustc_llvm_wrapper")
         .cpp(true)
         .cpp_link_stdlib(None) // we handle this below
         .compile("llvm-wrapper");
@@ -241,7 +251,7 @@ fn rustc_llvm_build() {
 
     // Link in the system libraries that LLVM depends on
     #[cfg(not(target_os = "windows"))]
-    link_llvm_system_libs(&llvm_config);
+    link_llvm_system_libs(&llvm_config, required_components);
 
     // LLVM ldflags
     //
@@ -330,10 +340,14 @@ fn rustc_llvm_build() {
 }
 
 #[cfg(not(target_os = "windows"))]
-fn link_llvm_system_libs(llvm_config: &Path) {
+fn link_llvm_system_libs(llvm_config: &Path, components: &[&str]) {
     let mut cmd = Command::new(&llvm_config);
     cmd.arg("--system-libs");
 
+    for comp in components {
+        cmd.arg(comp);
+    }
+
     for lib in output(&mut cmd).split_whitespace() {
         let name = if let Some(stripped) = lib.strip_prefix("-l") {
             stripped