Rename variables

Author: jieyouxu

Diff for: src/bootstrap/src/core/build_steps/test.rs

@@ -1361,7 +1361,6 @@ impl Step for RunMakeSupport {
         );
 
         let mut cargo = Command::from(cargo);
-        cargo.env("RUSTFLAGS", "-C prefer-dynamic");
         builder.run(&mut cargo);
 
         let lib_name = "librun_make_support.rlib";

Diff for: src/tools/compiletest/src/runtest.rs

@@ -3761,10 +3761,10 @@ impl<'test> TestCx<'test> {
         let stage = self.config.stage_id.split('-').next().unwrap();
 
         // First, we construct the path to the built support library.
-        let mut support_dylib_path = PathBuf::new();
-        support_dylib_path.push(&build_root);
-        support_dylib_path.push(format!("{}-tools-bin", stage));
-        support_dylib_path.push("librun_make_support.rlib");
+        let mut support_lib_path = PathBuf::new();
+        support_lib_path.push(&build_root);
+        support_lib_path.push(format!("{}-tools-bin", stage));
+        support_lib_path.push("librun_make_support.rlib");
 
         let mut stage_std_path = PathBuf::new();
         stage_std_path.push(&build_root);
@@ -3774,34 +3774,34 @@ impl<'test> TestCx<'test> {
         // Then, we need to build the recipe `rmake.rs` and link in the support library.
         let recipe_bin = tmpdir.join("rmake");
 
-        let mut support_dylib_deps = PathBuf::new();
-        support_dylib_deps.push(&build_root);
-        support_dylib_deps.push(format!("{}-tools", stage));
-        support_dylib_deps.push(&self.config.host);
-        support_dylib_deps.push("release");
-        support_dylib_deps.push("deps");
+        let mut support_lib_deps = PathBuf::new();
+        support_lib_deps.push(&build_root);
+        support_lib_deps.push(format!("{}-tools", stage));
+        support_lib_deps.push(&self.config.host);
+        support_lib_deps.push("release");
+        support_lib_deps.push("deps");
 
-        let mut support_dylib_deps_deps = PathBuf::new();
-        support_dylib_deps_deps.push(&build_root);
-        support_dylib_deps_deps.push(format!("{}-tools", stage));
-        support_dylib_deps_deps.push("release");
-        support_dylib_deps_deps.push("deps");
+        let mut support_lib_deps_deps = PathBuf::new();
+        support_lib_deps_deps.push(&build_root);
+        support_lib_deps_deps.push(format!("{}-tools", stage));
+        support_lib_deps_deps.push("release");
+        support_lib_deps_deps.push("deps");
 
-        debug!(?support_dylib_deps);
-        debug!(?support_dylib_deps_deps);
+        debug!(?support_lib_deps);
+        debug!(?support_lib_deps_deps);
 
         let res = self.cmd2procres(
             Command::new(&self.config.rustc_path)
                 .arg("-o")
                 .arg(&recipe_bin)
                 .arg(format!(
                     "-Ldependency={}",
-                    &support_dylib_path.parent().unwrap().to_string_lossy()
+                    &support_lib_path.parent().unwrap().to_string_lossy()
                 ))
-                .arg(format!("-Ldependency={}", &support_dylib_deps.to_string_lossy()))
-                .arg(format!("-Ldependency={}", &support_dylib_deps_deps.to_string_lossy()))
+                .arg(format!("-Ldependency={}", &support_lib_deps.to_string_lossy()))
+                .arg(format!("-Ldependency={}", &support_lib_deps_deps.to_string_lossy()))
                 .arg("--extern")
-                .arg(format!("run_make_support={}", &support_dylib_path.to_string_lossy()))
+                .arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))
                 .arg(&self.testpaths.file.join("rmake.rs"))
                 .env("TARGET", &self.config.target)
                 .env("PYTHON", &self.config.python)
@@ -3830,7 +3830,7 @@ impl<'test> TestCx<'test> {
         let mut dylib_env_paths = String::new();
         dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap());
         dylib_env_paths.push(':');
-        dylib_env_paths.push_str(&support_dylib_path.parent().unwrap().to_string_lossy());
+        dylib_env_paths.push_str(&support_lib_path.parent().unwrap().to_string_lossy());
         dylib_env_paths.push(':');
         dylib_env_paths.push_str(
             &stage_std_path.join("rustlib").join(&self.config.host).join("lib").to_string_lossy(),