| Message ID | 1339190167-20320-14-git-send-email-amartin@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
On 06/08/2012 03:16 PM, Allen Martin wrote: > Change the mkdir commands for the object directories to be more > general purpose. This fixes an issue when building for SPL where > SRCTREE and OBJTREE are the same, but $(obj) is under SPLTREE. Aside from my comments in the thread re: v2 of this patch, presumably this change or similar is needed for Compal Paz00 and Compulab TrimSlice too.
On Fri, Jun 08, 2012 at 10:29:39PM -0700, Stephen Warren wrote: > On 06/08/2012 03:16 PM, Allen Martin wrote: > > Change the mkdir commands for the object directories to be more > > general purpose. This fixes an issue when building for SPL where > > SRCTREE and OBJTREE are the same, but $(obj) is under SPLTREE. > > Aside from my comments in the thread re: v2 of this patch, presumably > this change or similar is needed for Compal Paz00 and Compulab TrimSlice > too. Strangely they didn't fail, but maybe that's because "make clobber" doesn't remove the directory and so once I fixed the first one the others all worked ok. But you're right, they should all have the same problem. -Allen
Hi Allen, On Fri, Jun 8, 2012 at 2:16 PM, Allen Martin <amartin@nvidia.com> wrote: > Change the mkdir commands for the object directories to be more > general purpose. This fixes an issue when building for SPL where > SRCTREE and OBJTREE are the same, but $(obj) is under SPLTREE. > > Signed-off-by: Allen Martin <amartin@nvidia.com> > --- > board/avionic-design/plutux/Makefile | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/board/avionic-design/plutux/Makefile > b/board/avionic-design/plutux/Makefile > index d96d043..6bd394e 100644 > --- a/board/avionic-design/plutux/Makefile > +++ b/board/avionic-design/plutux/Makefile > @@ -25,8 +25,11 @@ > > include $(TOPDIR)/config.mk > > -ifneq ($(OBJTREE),$(SRCTREE)) > -$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) > +ifeq ($(wildcard $(obj)../common),) > +$(shell mkdir -p $(obj)../common) > +endif > +ifeq ($(wildcard $(obj)../../nvidia/common),) > +$(shell mkdir -p $(obj)../../nvidia/common) > endif > Please could we have a little comment in the code here explaining what you are doing? Could this go in a common include file perhaps? It feels like this logic could in fact be done by spl/Makefile, but I haven't checked so could be wrong. > LIB = $(obj)lib$(BOARD).o > -- > 1.7.9.5 > > Regards, Simon
diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile index d96d043..6bd394e 100644 --- a/board/avionic-design/plutux/Makefile +++ b/board/avionic-design/plutux/Makefile @@ -25,8 +25,11 @@ include $(TOPDIR)/config.mk -ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) +ifeq ($(wildcard $(obj)../common),) +$(shell mkdir -p $(obj)../common) +endif +ifeq ($(wildcard $(obj)../../nvidia/common),) +$(shell mkdir -p $(obj)../../nvidia/common) endif LIB = $(obj)lib$(BOARD).o
Change the mkdir commands for the object directories to be more general purpose. This fixes an issue when building for SPL where SRCTREE and OBJTREE are the same, but $(obj) is under SPLTREE. Signed-off-by: Allen Martin <amartin@nvidia.com> --- board/avionic-design/plutux/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)