From d07d256f18c8377d384f96f6931fecbfb199d6cf Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 6 Feb 2021 10:51:24 -0700
Subject: [PATCH] racket/src/configure: correct default when CS and BC are both
 enabled

---
 racket/src/bc/configure-parent.ac   | 6 +++++-
 racket/src/cfg-bc                   | 6 +++++-
 racket/src/cfg-cs                   | 2 ++
 racket/src/cs/c/configure-parent.ac | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/racket/src/bc/configure-parent.ac b/racket/src/bc/configure-parent.ac
index ccf4ef2a56..d73ac45a9f 100644
--- a/racket/src/bc/configure-parent.ac
+++ b/racket/src/bc/configure-parent.ac
@@ -46,7 +46,11 @@ if test "${enable_cgcdefault}" = "yes" ; then
 else
   MAIN_VARIANT=3m
 fi
-MAIN_MAKE_TARGET="${MAIN_VARIANT}"
+if test "${enable_csdefault}" = "yes" ; then
+  MAIN_MAKE_TARGET="racketcs"
+else
+  MAIN_MAKE_TARGET="${MAIN_VARIANT}"
+fi
 
 if test "${enable_racket}" != "" ; then
   RUN_RACKET="${enable_racket}"
diff --git a/racket/src/cfg-bc b/racket/src/cfg-bc
index b6e603300d..5c4f11d76e 100755
--- a/racket/src/cfg-bc
+++ b/racket/src/cfg-bc
@@ -2336,7 +2336,11 @@ if test "${enable_cgcdefault}" = "yes" ; then
 else
   MAIN_VARIANT=3m
 fi
-MAIN_MAKE_TARGET="${MAIN_VARIANT}"
+if test "${enable_csdefault}" = "yes" ; then
+  MAIN_MAKE_TARGET="racketcs"
+else
+  MAIN_MAKE_TARGET="${MAIN_VARIANT}"
+fi
 
 if test "${enable_racket}" != "" ; then
   RUN_RACKET="${enable_racket}"
diff --git a/racket/src/cfg-cs b/racket/src/cfg-cs
index 22b669c62a..fe2134449c 100755
--- a/racket/src/cfg-cs
+++ b/racket/src/cfg-cs
@@ -2240,6 +2240,8 @@ fi
 RUN_LOCAL_RACKET="local/cs/c/racketcs"
 CONFIGURE_LOCAL_RACKET=--enable-cs
 
+# If BC is the default, then we rely on BC configure-parent
+# being used instead of this one:
 MAIN_MAKE_TARGET=racketcs
 MAIN_VARIANT=3m
 
diff --git a/racket/src/cs/c/configure-parent.ac b/racket/src/cs/c/configure-parent.ac
index ff6132d425..4c3f82c198 100644
--- a/racket/src/cs/c/configure-parent.ac
+++ b/racket/src/cs/c/configure-parent.ac
@@ -31,6 +31,8 @@ fi
 RUN_LOCAL_RACKET="local/cs/c/racketcs"
 CONFIGURE_LOCAL_RACKET=--enable-cs
 
+# If BC is the default, then we rely on BC configure-parent
+# being used instead of this one:
 MAIN_MAKE_TARGET=racketcs
 MAIN_VARIANT=3m