diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-26 07:49:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:29:50 -0700 |
| commit | 0b1556945475e8529328edf98ff0d201ed133edb (patch) | |
| tree | 2093425c89eae4ab7dbb9be70c2efb8d084ced2a /arch | |
| parent | a880948b2b88c05af9a471ca5c52883e64d3f7b8 (diff) | |
| download | linux-3.10-0b1556945475e8529328edf98ff0d201ed133edb.tar.gz linux-3.10-0b1556945475e8529328edf98ff0d201ed133edb.tar.bz2 linux-3.10-0b1556945475e8529328edf98ff0d201ed133edb.zip | |
[PATCH] missing dependency on arm O= builds
arm maketools needs include/asm-arm in place in the build tree.
On normal builds it's always there, of course, but on O= it's created
(by generic code) too late - when we get to asm-offset.h.
We used to get away with that by accident - creation of
include/asm-arm/arch symlink creates include/asm-arm and it happened
to go before maketools. However, we did not have such dependency,
so that luck didn't last - now maketools is picked first and we are screwed.
Both the symlink and maketools are prerequisites of the same
target (archprepare). This fix is obvious - make the latter explicitly
depend on the former and be done with that.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 130e6228b58..7779f2d1aca 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -175,10 +175,10 @@ else endif @touch $@ -archprepare: maketools include/asm-arm/.arch +archprepare: maketools .PHONY: maketools FORCE -maketools: include/linux/version.h FORCE +maketools: include/linux/version.h include/asm-arm/.arch FORCE $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h # Convert bzImage to zImage |