On Fri, 2008-06-27 at 16:12 +0300, Adrian Bunk wrote: > On Fri, Jun 27, 2008 at 02:06:24PM +0100, David Woodhouse wrote: > > On Fri, 2008-06-27 at 16:02 +0300, Adrian Bunk wrote: > > > Commit e53d6a152793a38aa334d6f7a4850642ae45cedc > > > (Export <linux/a.out.h> to userspace again.) > > > does not work properly when using O= : > > > > Hm, I copied the logic from the existing condition in > > include/asm-generic/Kbuild.asm. Does that not work either? > > It doesn't work: > > linux-2.6.26-rc8$ make O=../out headers_install > ... > linux-2.6.26-rc8$ find ../out -name a.out.h You're right; it doesn't work with O=, and hasn't since David Howells first added that conditional export in commit 7fa30315. This fixes it: --- From: David Woodhouse <david.woodhouse@xxxxxxxxx> Subject: 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@xxxxxxxxx> diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 92a6d91..7cd25b8 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm @@ -1,6 +1,6 @@ header-y += kvm.h -ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) +ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) unifdef-y += a.out.h endif unifdef-y += auxvec.h diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild index 7381916..bca352e 100644 --- a/include/asm-powerpc/Kbuild +++ b/include/asm-powerpc/Kbuild @@ -1,6 +1,5 @@ include include/asm-generic/Kbuild.asm -header-y += a.out.h header-y += auxvec.h header-y += ioctls.h header-y += mman.h diff --git a/include/linux/Kbuild b/include/linux/Kbuild index b6fbb25..71d70d1 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -166,7 +166,7 @@ unifdef-y += acct.h unifdef-y += adb.h unifdef-y += adfs_fs.h unifdef-y += agpgart.h -ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) +ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) unifdef-y += a.out.h endif unifdef-y += apm_bios.h -- dwmw2 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
