From 9fc122380a7569f89bdf67004adba49dfa0d2140 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Wed, 20 Nov 2013 09:44:11 -0700
Subject: [PATCH] Move backup related stuff to its own Makefile.

This will prevent Makefile errors from affecting backups. This happens when
different branches include Makefile helpers other branches don't have. This
should be more reliable.
---
 Makefile.backup | 17 +++++++++++++++++
 Makefile.in     | 14 +++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 Makefile.backup

diff --git a/Makefile.backup b/Makefile.backup
new file mode 100644
index 00000000000..76acaf0fbfd
--- /dev/null
+++ b/Makefile.backup
@@ -0,0 +1,17 @@
+# Build commands for backing up and restoring the Rust build.
+# Because Rust takes a very long time to build and changes infrequently,
+# the bots want to reuse it between builds. They can do so by running
+# `make backup-rust` and `make restore-rust`.
+#
+# backup-rust is run before the build directory is cleaned. if it fails, that's ok.
+#
+# restore-rust is run after configure and before invoking make. if it fails, we must abort.
+
+include config.mk
+
+.PHONY: backup-rust restore-rust
+backup-rust:
+	-mv $(CFG_BUILD_DIR)src/compiler/rust ../$(CFG_TARGET_TRIPLES)
+
+restore-rust:
+	if [ -d ../$(CFG_TARGET_TRIPLES) ]; then rm -rf $(CFG_BUILD_DIR)src/compiler/rust; mv ../$(CFG_TARGET_TRIPLES) $(CFG_BUILD_DIR)src/compiler/rust; fi
diff --git a/Makefile.in b/Makefile.in
index 3dd528a04f7..c52933d5a45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -363,21 +363,13 @@ package:
 
 endif
 
-# Build commands for backing up and restoring the Rust build.
-# Because Rust takes a very long time to build and changes infrequently,
-# the bots want to reuse it between builds. They can do so by running
-# `make backup-rust` and `make restore-rust`.
-#
-# backup-rust is run before the build directory is cleaned. if it fails, that's ok.
-#
-# restore-rust is run after configure and before invoking make. if it fails, we must abort.
+# Backup targets. These axist until build slaves are using Makefile.backup directly.
 
 .PHONY: backup-rust restore-rust
 backup-rust:
-	-mv $(B)src/compiler/rust ../$(CFG_TARGET_TRIPLES)
+	$(MAKE) -f $(S)Makefile.backup $@
 
 restore-rust:
-	if [ -d ../$(CFG_TARGET_TRIPLES) ]; then rm -rf $(B)src/compiler/rust; mv ../$(CFG_TARGET_TRIPLES) $(B)src/compiler/rust; fi
+	$(MAKE) -f $(S)Makefile.backup $@
 
 .NOTPARALLEL:
-