src/emacs: replace 'mr configure' with 'mr debug' and 'mr nodebug'

1 files changed, 21 insertions, 7 deletions

diff --git a/.mrconfig.in b/.mrconfig.in
index 9b6a6829..f5e72cf9 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -423,18 +423,32 @@ skip = lazy
 
 [src/emacs]
 checkout = git clone --no-checkout https://git.savannah.gnu.org/git/emacs.git emacs
-configure =
-    test -f configure || ./autogen.sh
+
+lib =
+    prep () {
+        test -f configure || ./autogen.sh
+	rm -f config.cache
+    }
     # These configure flags are for my workstation development builds.
-    ./configure --config-cache --with-native-compilation --with-pgtk \
-        # from etc/DEBUG
-        --enable-checking='yes,glyphs' --enable-check-lisp-object-type \
-        CFLAGS='-O0 -g3'
+    opts="--config-cache --with-native-compilation --with-pgtk
+              --enable-check-lisp-object-type"
+
+# Most of the time I'm working either on things other than Emacs or on Emacs
+# at the Lisp level, and these etc/DEBUG-recommended options, other than
+# --enable-check-lisp-object-type, really do slow Emacs down.  It is quite
+# quick to reconfigure and rebuild Emacs's C core with and without debug flags
+# (the .elc and .eln stick around).  Use two mr commands to make the two sets
+# of configure flags easy to get at.
+debug =
+    prep
+    ./configure $opts --enable-checking='yes,glyphs' CFLAGS='-O0 -g3' "$@"
+nodebug = prep; ./configure $opts "$@"
+
 post_checkout =
     cd emacs
     git remote add -f demeter demeter:emacs
     git checkout -b melete demeter/melete
-    mr configure
+    mr nodebug
 fixups =
     git branch --unset-upstream melete
     git config branch.melete.rebase true