From bd5677da700236da219f31179676dc4d7b01c43c Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 29 Apr 2019 12:01:23 -0600
Subject: [PATCH] Revert "cs: fix cross-build bootstrap"

This reverts commit e13fcd62260ab1a14243a5dfd6877ab04e0c09ee.

Wasn't the right change, because the modified targets aren't used for
a cross build.
---
 racket/src/cs/c/Makefile.in | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index 1398b2f96b..196b9a84b3 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -146,24 +146,24 @@ SCHEME_CONFIG_VARS = CC="$(CC)" CFLAGS="$(BASE_CFLAGS)" LD="$(LD)" LDFLAGS="$(LD
                      WINDRES="$(WINDRES)"
 
 scheme-make-finish:
-	env SCHEME_SRC="$(SCHEME_SRC)" MACH="$(TARGET_MACH)" $(BOOTSTRAP_RACKET) $(srcdir)/../bootstrap/make-boot.rkt
+	env SCHEME_SRC="$(SCHEME_SRC)" MACH="$(MACH)" $(BOOTSTRAP_RACKET) $(srcdir)/../bootstrap/make-boot.rkt
 	cd $(SCHEME_SRC) && ./configure @SCHEME_CONFIG_ARGS@ $(SCHEME_CONFIG_VARS)
-	mkdir -p $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)
-	$(MAKE) $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/equates.h
-	$(MAKE) $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.h
-	$(MAKE) $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/petite.boot
-	$(MAKE) $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.boot
+	mkdir -p $(SCHEME_SRC)/$(MACH)/boot/$(MACH)
+	$(MAKE) $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/equates.h
+	$(MAKE) $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.h
+	$(MAKE) $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/petite.boot
+	$(MAKE) $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.boot
 	cd $(SCHEME_SRC) && $(MAKE)
 
 # If "equates.h", etc., are newly built since previous build, move them into place
-$(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/equates.h: $(SCHEME_SRC)/boot/$(TARGET_MACH)/equates.h
-	cp $(SCHEME_SRC)/boot/$(TARGET_MACH)/equates.h $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/equates.h
-$(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.h: $(SCHEME_SRC)/boot/$(TARGET_MACH)/scheme.h
-	cp $(SCHEME_SRC)/boot/$(TARGET_MACH)/scheme.h $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.h
-$(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/petite.boot: $(SCHEME_SRC)/boot/$(TARGET_MACH)/petite.boot
-	cp $(SCHEME_SRC)/boot/$(TARGET_MACH)/petite.boot $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/petite.boot
-$(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.boot: $(SCHEME_SRC)/boot/$(TARGET_MACH)/scheme.boot
-	cp $(SCHEME_SRC)/boot/$(TARGET_MACH)/scheme.boot $(SCHEME_SRC)/$(TARGET_MACH)/boot/$(TARGET_MACH)/scheme.boot
+$(SCHEME_SRC)/$(MACH)/boot/$(MACH)/equates.h: $(SCHEME_SRC)/boot/$(MACH)/equates.h
+	cp $(SCHEME_SRC)/boot/$(MACH)/equates.h $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/equates.h
+$(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.h: $(SCHEME_SRC)/boot/$(MACH)/scheme.h
+	cp $(SCHEME_SRC)/boot/$(MACH)/scheme.h $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.h
+$(SCHEME_SRC)/$(MACH)/boot/$(MACH)/petite.boot: $(SCHEME_SRC)/boot/$(MACH)/petite.boot
+	cp $(SCHEME_SRC)/boot/$(MACH)/petite.boot $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/petite.boot
+$(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.boot: $(SCHEME_SRC)/boot/$(MACH)/scheme.boot
+	cp $(SCHEME_SRC)/boot/$(MACH)/scheme.boot $(SCHEME_SRC)/$(MACH)/boot/$(MACH)/scheme.boot
 
 scheme-cross:
 	cd $(SCHEME_SRC) && git submodule -q init && git submodule -q update