Move libgccjit.so to the new location within the sysroot

Author: antoyo

build_system/src/build.rs

@@ -111,14 +111,20 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
 
     // Symlink libgccjit.so to sysroot.
     let lib_path = start_dir.join("sysroot").join("lib");
+    let rustlib_target_path = lib_path
+        .join("rustlib")
+        .join(&config.target_triple)
+        .join("codegen-backends")
+        .join("lib")
+        .join(&config.target_triple);
     let libgccjit_path =
         PathBuf::from(config.gcc_path.as_ref().expect("libgccjit should be set by this point"))
             .join("libgccjit.so");
-    let libgccjit_in_sysroot_path = lib_path.join("libgccjit.so");
+    let libgccjit_in_sysroot_path = rustlib_target_path.join("libgccjit.so");
     // First remove the file to be able to create the symlink even when the file already exists.
     let _ = fs::remove_file(&libgccjit_in_sysroot_path);
-    create_dir(&lib_path)?;
-    symlink(libgccjit_path, libgccjit_in_sysroot_path)
+    create_dir(&rustlib_target_path)?;
+    symlink(libgccjit_path, &libgccjit_in_sysroot_path)
         .map_err(|error| format!("Cannot create symlink for libgccjit.so: {}", error))?;
 
     let library_dir = start_dir.join("sysroot_src").join("library");