@@ -317,7 +317,7 @@ (define-public emacs-no-x
(add-after 'unpack 'patch-compilation-driver
(lambda _
(substitute* "lisp/emacs-lisp/comp.el"
- (("\\(defcustom native-comp-driver-options nil")
+ (("\\(defcustom native-comp-driver-options.*")
(format
#f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
(string-append
@@ -327,7 +327,12 @@ (define-public emacs-no-x
(string-append
"-B" #$(this-package-input "libgccjit") "/lib/")
(string-append
- "-B" #$(this-package-input "libgccjit") "/lib/gcc/"))))))))))
+ "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))
+ ;; Most recent version of emacs include a non-nil
+ ;; native-comp-driver-options. The next substitution
+ ;; erases such lines.
+ ((".*'\\(\"-Wl,-.*")
+ ""))))))))
(inputs
(modify-inputs (package-inputs emacs-minimal)
(prepend gnutls