From 2d718cc86f6a980059cc7d3f7f7dca499723e61c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 27 Jan 2021 03:37:55 -0500
Subject: [PATCH] Remove eager native compilation of subr-trampolines

This was fixed upstream.
---
 core/cli/packages.el | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/core/cli/packages.el b/core/cli/packages.el
index eabbc0d10..a872a4916 100644
--- a/core/cli/packages.el
+++ b/core/cli/packages.el
@@ -232,46 +232,11 @@ list remains lean."
              (doom-log "Compiling %s" file)
              (native-compile-async file))))
 
-(defun doom--bootstrap-trampolines ()
-  "Build the trampolines we need to prevent hanging."
-  (when (featurep 'comp)
-    ;; HACK The following list was obtained by running 'doom build', waiting for
-    ;;      it to hang, then checking the eln-cache for trampolines.  We
-    ;;      simulate running 'doom build' twice by compiling the trampolines
-    ;;      then restarting.
-    (let (restart)
-      (dolist (f '(abort-recursive-edit
-                   describe-buffer-bindings
-                   execute-kbd-macro
-                   handle-switch-frame
-                   load
-                   make-indirect-buffer
-                   make-process
-                   message
-                   read-char
-                   read-key-sequence
-                   select-window
-                   set-window-buffer
-                   top-level
-                   use-global-map
-                   use-local-map
-                   write-region))
-        (unless (doom--find-eln-file
-                 (concat comp-native-version-dir "/"
-                         (comp-trampoline-filename f)))
-          (print! (info "Compiling trampoline for %s") f)
-          (comp-trampoline-compile f)
-          (setq restart t)))
-      (when restart
-        (throw 'exit :restart)))))
-
-
 (defun doom-cli-packages-install ()
   "Installs missing packages.
 
 This function will install any primary package (i.e. a package with a `package!'
 declaration) or dependency thereof that hasn't already been."
-  (doom--bootstrap-trampolines)
   (doom-initialize-packages)
   (print! (start "Installing packages..."))
   (let ((pinned (doom-package-pinned-list)))
@@ -311,7 +276,6 @@ declaration) or dependency thereof that hasn't already been."
 
 (defun doom-cli-packages-build (&optional force-p)
   "(Re)build all packages."
-  (doom--bootstrap-trampolines)
   (doom-initialize-packages)
   (print! (start "(Re)building %spackages...") (if force-p "all " ""))
   (print-group!