Emacs master failing to build

[Matthew Leach <matthew@mattleach.net>]

Hi Philipp,

I'm having problems building current Emacs master:

--8<---------------cut here---------------start------------->8---
Loading /home/matthew/Development/emacs/lisp/emacs-lisp/cl-preloaded.el (source)...
Warning: Eager macro-expansion skipped due to cycle:
  … => (load "cl-generic.el") => (macroexpand-all …) => (macroexpand (eval-when-compile …)) => (load "cl-lib.el") => (load "cl-macs.el") => (load "cl-generic.el")
Eager macro-expansion failure: (error "Recursive ‘require’ for feature ‘cl-generic’")
--8<---------------cut here---------------end--------------->8---

The full output can be found in [1].  If I revert the commit
151496a4b964, this seems to fix the issue.

Thanks,
-- 
Matt
[1]: https://pastebin.com/raw/bqKpcqLV