diff --git a/core/cli/packages.el b/core/cli/packages.el
index 0b5e927d6..50dfcf860 100644
--- a/core/cli/packages.el
+++ b/core/cli/packages.el
@@ -126,8 +126,14 @@ list remains lean."
       (doom-log "%s is newer than %s" file elc-file)
       t)))
 
+;; DEPRECATED Remove later
+(defun doom--comp-output-filename (file)
+  (if (fboundp 'comp-output-filename)
+      (comp-output-filename file)
+    (comp-el-to-eln-filename file)))
+
 (defun doom--eln-file-outdated-p (file)
-  (when-let* ((eln-file (comp-output-filename file))
+  (when-let* ((eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (push eln-file doom--expected-eln-files)
     (cond ((file-exists-p eln-file)
@@ -144,7 +150,7 @@ list remains lean."
 
 (defun doom--native-compile-done-h (file)
   (when-let* ((file)
-              (eln-file (comp-output-filename file))
+              (eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (if (file-exists-p eln-file)
         (doom-log "Compiled %s" eln-file)
diff --git a/core/core-packages.el b/core/core-packages.el
index d7ec30bd9..d671f5a20 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -97,9 +97,7 @@ uses a straight or package.el command directly).")
       ;; we don't have to deal with them at all.
       autoload-compute-prefixes nil
       ;; We handle it ourselves
-      straight-fix-org nil
-      ;; HACK Disable native-compilation for some troublesome files
-      comp-deferred-compilation-black-list '("/evil-collection-vterm\\.el$"))
+      straight-fix-org nil)
 
 (with-eval-after-load 'straight
   ;; `let-alist' is built into Emacs 26 and onwards
diff --git a/core/core.el b/core/core.el
index 9fcaff288..4c96f5a68 100644
--- a/core/core.el
+++ b/core/core.el
@@ -269,6 +269,17 @@ config.el instead."
   (let ((user-init-file custom-file))
     (apply orig-fn args)))
 
+;; For gccemacs users: http://akrl.sdf.org/gccemacs.html
+(after! comp
+  ;; Prevent unwanted runtime builds; packages are compiled ahead-of-time when
+  ;; they are installed and site files are compiled when gccemacs is installed.
+  (setq comp-deferred-compilation nil)
+  ;; Don't store eln files in ~/.emacs.d; it's likely to be purged when
+  ;; upgrading Doom.
+  (add-to-list 'comp-eln-load-path (concat doom-cache-dir "eln/"))
+  ;; HACK Disable native-compilation for some troublesome packages
+  (add-to-list 'comp-deferred-compilation-black-list "/evil-collection-vterm\\.el\\'"))
+
 
 ;;
 ;;; Optimizations