Move to rustlib directory

Author: antoyo

compiler/rustc_codegen_gcc/src/lib.rs

@@ -186,8 +186,9 @@ fn load_libgccjit_if_needed(sysroot_path: &Path, target_triple: &str) {
         return;
     }
 
-    let sysroot_lib_dir = sysroot_path.join("lib");
-    let libgccjit_target_lib_file = sysroot_lib_dir.join(target_triple).join("libgccjit.so");
+    let sysroot_lib_dir = sysroot_path.join("lib").join("rustlib");
+    let libgccjit_target_lib_file =
+        sysroot_lib_dir.join(target_triple).join("lib").join("libgccjit.so");
     let path = libgccjit_target_lib_file.to_str().expect("libgccjit path");
 
     let string = CString::new(path).expect("string to libgccjit path");

src/bootstrap/src/core/build_steps/gcc.rs

@@ -47,7 +47,7 @@ impl GccOutput {
             format!("Cannot find libgccjit at {}", self.libgccjit.display())
         );
 
-        let dest_dir = directory.join(self.target);
+        let dest_dir = directory.join("rustlib").join(self.target).join("lib");
         t!(fs::create_dir_all(&dest_dir));
         let dst = dest_dir.join(target_filename);
         builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);