Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2043785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild fix from Michal Marek:
 "One fix for for make headers_install/headers_check to not require make
  3.81.  The requirement has been accidentally introduced in 3.7."

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: fix make headers_check with make 3.80
parents 23659587 c4619bc6

scripts/Makefile.headersinst

+6 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild 
include $(kbuild-file)



# called may set destination dir (when installing to asm/)

_dst := $(or $(destination-y),$(dst),$(obj))

_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj)))



old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild

ifneq ($(wildcard $(old-kbuild-file)),)
@@ -48,13 +48,14 @@ all-files := $(header-y) $(genhdr-y) $(wrapper-files) 
output-files  := $(addprefix $(installdir)/, $(all-files))



input-files   := $(foreach hdr, $(header-y), \

		   $(or \

		   $(if $(wildcard $(srcdir)/$(hdr)), \

			$(wildcard $(srcdir)/$(hdr)), \

			$(if $(wildcard $(oldsrcdir)/$(hdr)), \

				$(wildcard $(oldsrcdir)/$(hdr)), \

			$(error Missing UAPI file $(srcdir)/$(hdr)) \

				$(error Missing UAPI file $(srcdir)/$(hdr))) \

		   )) \

		 $(foreach hdr, $(genhdr-y), \

		   $(or \

		   $(if	$(wildcard $(gendir)/$(hdr)), \

			$(wildcard $(gendir)/$(hdr)), \

			$(error Missing generated UAPI file $(gendir)/$(hdr)) \

		   ))