Merge pull request rust-lang#436 from GuillaumeGomez/cleanup-patches

Move `crates_patches` and `cross_patches` into the `patches` folder

.gitignore

@@ -10,16 +10,10 @@ perf.data.old
 /build_sysroot/sysroot_src
 /build_sysroot/Cargo.lock
 /build_sysroot/test_target/Cargo.lock
-/rust
-/simple-raytracer
-/regex
-/rand
 gimple*
 *asm
 res
 test-backend
-gcc_path
-cross_gcc_path
 projects
 benchmarks
 tools/llvm-project

build_system/src/prepare.rs

@@ -95,7 +95,7 @@ fn prepare_libcore(
  )?;
  if cross_compile {
  walk_dir(
- "cross_patches",
+ "patches/cross_patches",
  |_| Ok(()),
  |file_path: &Path| {
  patches.push(file_path.to_path_buf());
@@ -161,7 +161,7 @@ where
  run_command(&[&"git", &"checkout", &checkout_commit], Some(&repo_path))?;
  let filter = format!("-{}-", clone_result.repo_name);
  walk_dir(
- "crate_patches",
+ "patches/crate_patches",
  |_| Ok(()),
  |file_path| {
  let patch = file_path.as_os_str().to_str().unwrap();