summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-08-06 21:56:53 +0200
committerSam Ravnborg <sam@ravnborg.org>2008-08-06 21:56:53 +0200
commit7a48bdd01b5cab9c043b4d42a3f377624d6259f2 (patch)
tree9cbb7bd1f90e229b5fcfde52d3194020992b31de
parent0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 (diff)
downloadlinux-stable-7a48bdd01b5cab9c043b4d42a3f377624d6259f2.tar.gz
linux-stable-7a48bdd01b5cab9c043b4d42a3f377624d6259f2.tar.bz2
linux-stable-7a48bdd01b5cab9c043b4d42a3f377624d6259f2.zip
kbuild: fix O=.. build with arm
With a make O=... build kbuild would only create the include2/asm symlink for archs that not yet had moved headers to include/$ARCH/include There is no longer any reason to avoid the symlink for archs that has moved their headers so create it unconditionally. This fixes arm because kbuild checked for include/asm-$ARCH/errno.h and that file was not present for arm but the platform files are not yet moved. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ea413fa03e4e..343ec4774b55 100644
--- a/Makefile
+++ b/Makefile
@@ -929,10 +929,10 @@ ifneq ($(KBUILD_SRC),)
echo " in the '$(srctree)' directory.";\
/bin/false; \
fi;
- $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
- $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then \
+ $(Q)if [ ! -d include2 ]; then \
+ mkdir -p include2; \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
- fi
+ fi
endif
# prepare2 creates a makefile if using a separate output directory