Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b660398101cd0622325480a67ac88bb4d33d553a

Authored by David Woodhouse
Committed by Sam Ravnborg
1 parent 543cf4cb3f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

kbuild: fix a.out.h export to userspace with O= build. 

We need to check for existence of the a.out.h header in the source tree,
not the object tree, if we want it to get the right answer with O=.

Signed-off-by: David Woodhouse <david.woodhouse@intel.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Showing 3 changed files with 2 additions and 3 deletions Side-by-side Diff

include/asm-generic/Kbuild.asm
Diff comments   View file @ b660398
1 1 header-y += kvm.h
2 2  
3   -ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h)
  3 +ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
4 4 unifdef-y += a.out.h
5 5 endif
6 6 unifdef-y += auxvec.h
include/asm-powerpc/Kbuild
Diff comments   View file @ b660398
1 1 include include/asm-generic/Kbuild.asm
2 2  
3   -header-y += a.out.h
4 3 header-y += auxvec.h
5 4 header-y += ioctls.h
6 5 header-y += mman.h
include/linux/Kbuild
Diff comments   View file @ b660398
... ... @@ -166,7 +166,7 @@
166 166 unifdef-y += adb.h
167 167 unifdef-y += adfs_fs.h
168 168 unifdef-y += agpgart.h
169   -ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h)
  169 +ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
170 170 unifdef-y += a.out.h
171 171 endif
172 172 unifdef-y += apm_bios.h