V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Makefile: do not create a symbolic link to arch/${ARCH}/include/asm 

In-tree build:
  - Do not create a symbolic link
      from include/asm to arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Out-of-tree build:
  - Do not create a directory ${OBJTREE}/include2
  - Do not create a symbolic link
      from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2013-11-01 10:28:45 +09:00 committed by Tom Rini
parent 7d9ec6a0af
commit bb02c53660
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.mk
View File

@ -257,10 +257,10 @@ endif
endif endif
ifneq ($(OBJTREE),$(SRCTREE)) ifneq ($(OBJTREE),$(SRCTREE))
CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include CPPFLAGS += -I$(OBJTREE)/include
endif endif
CPPFLAGS += -I$(TOPDIR)/include CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \ CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)

14
mkconfig
View File

@ -96,17 +96,11 @@ fi
# #
if [ "$SRCTREE" != "$OBJTREE" ] ; then if [ "$SRCTREE" != "$OBJTREE" ] ; then
mkdir -p ${OBJTREE}/include mkdir -p ${OBJTREE}/include
mkdir -p ${OBJTREE}/include2
cd ${OBJTREE}/include2
rm -f asm
ln -s ${SRCTREE}/arch/${arch}/include/asm asm
LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/ LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
cd ../include cd ${OBJTREE}/include
mkdir -p asm mkdir -p asm
else else
cd ./include cd arch/${arch}/include
rm -f asm
ln -s ../arch/${arch}/include/asm asm
fi fi
rm -f asm/arch rm -f asm/arch
@ -122,6 +116,10 @@ if [ "${arch}" = "arm" ] ; then
ln -s ${LNPREFIX}proc-armv asm/proc ln -s ${LNPREFIX}proc-armv asm/proc
fi fi
if [ "$SRCTREE" = "$OBJTREE" ] ; then
cd ${SRCTREE}/include
fi
# #
# Create include file for Make # Create include file for Make
# #

2
tools/Makefile
View File

@ -160,7 +160,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y))
# #
HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \ HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \
-idirafter $(SRCTREE)/include \ -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \ -idirafter $(SRCTREE)/arch/$(ARCH)/include \
-idirafter $(OBJTREE)/include \ -idirafter $(OBJTREE)/include \
-I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \

2
tools/env/Makefile vendored
View File

@ -14,7 +14,7 @@ HEADERS := fw_env.h $(OBJTREE)/include/config.h
# Compile for a hosted environment on the target # Compile for a hosted environment on the target
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \ -idirafter $(SRCTREE)/arch/$(ARCH)/include \
-idirafter $(OBJTREE)/include \ -idirafter $(OBJTREE)/include \
-idirafter $(SRCTREE)/tools/env \ -idirafter $(SRCTREE)/tools/env \
-DUSE_HOSTCC \ -DUSE_HOSTCC \

2
tools/imls/Makefile
View File

@ -37,7 +37,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
# #
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \ -idirafter $(SRCTREE)/arch/$(ARCH)/include \
-idirafter $(OBJTREE)/include \ -idirafter $(OBJTREE)/include \
-I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \