kbuild: use $(KBUILD_SRC) to check out-of-tree build

Non-empty $(KBUILD_SRC) means out-of-tree build.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2014-03-11 11:05:18 +09:00 committed by Tom Rini
parent 4ab3fc5eba
commit f5c66bdb18
2 changed files with 5 additions and 7 deletions

View File

@ -556,11 +556,9 @@ export CONFIG_SYS_TEXT_BASE
# Use UBOOTINCLUDE when you must reference the include/ directory. # Use UBOOTINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option # Needed to be compatible with the O= option
UBOOTINCLUDE := UBOOTINCLUDE := \
ifneq ($(OBJTREE),$(SRCTREE)) -Iinclude \
UBOOTINCLUDE += -I$(OBJTREE)/include $(if $(KBUILD_SRC), -I$(srctree)/include) \
endif
UBOOTINCLUDE += -I$(srctree)/include \
-I$(srctree)/arch/$(ARCH)/include -I$(srctree)/arch/$(ARCH)/include
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)

View File

@ -103,7 +103,7 @@ fi
# #
# Create link to architecture specific headers # Create link to architecture specific headers
# #
if [ "$SRCTREE" != "$OBJTREE" ] ; then if [ -n "$KBUILD_SRC" ] ; then
mkdir -p ${OBJTREE}/include mkdir -p ${OBJTREE}/include
LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/ LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
cd ${OBJTREE}/include cd ${OBJTREE}/include
@ -125,7 +125,7 @@ if [ "${arch}" = "arm" ] ; then
ln -s ${LNPREFIX}proc-armv asm/proc ln -s ${LNPREFIX}proc-armv asm/proc
fi fi
if [ "$SRCTREE" = "$OBJTREE" ] ; then if [ -z "$KBUILD_SRC" ] ; then
cd ${SRCTREE}/include cd ${SRCTREE}/include
fi fi