diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-12 01:54:54 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-12 01:54:54 +0000 |
| commit | fe19d5bea139e25e04c5260726ec300e49ffdf2b (patch) | |
| tree | 2f38b418f4df4610fc87f117e7e8be9996710da0 /nuttx/arch/mips | |
| parent | 63e8e1bed383170be61d722348be7efcf1a33ec3 (diff) | |
| download | px4-firmware-fe19d5bea139e25e04c5260726ec300e49ffdf2b.tar.gz px4-firmware-fe19d5bea139e25e04c5260726ec300e49ffdf2b.tar.bz2 px4-firmware-fe19d5bea139e25e04c5260726ec300e49ffdf2b.zip | |
A few more build fixes
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5340 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/mips')
| -rw-r--r-- | nuttx/arch/mips/src/Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/nuttx/arch/mips/src/Makefile b/nuttx/arch/mips/src/Makefile index dd9aa3ed5..8d02ac59c 100644 --- a/nuttx/arch/mips/src/Makefile +++ b/nuttx/arch/mips/src/Makefile @@ -69,30 +69,33 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = ${shell if exist "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile" (echo "y")} LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE := ${shell if [ -r "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile" ]; then echo "y"; fi} ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else LIBPATHS += -L"$(TOPDIR)/lib" -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) +ifeq ($(BOARDMAKE),y) + LDLIBS += -lboard +endif LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" @@ -117,7 +120,7 @@ board/libboard$(LIBEXT): nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \ - --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group + --start-group $(LDLIBS) $(EXTRA_LIBS) $(LIBGCC) --end-group $(Q) $(NM) $(NUTTX)$(EXEEXT) | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map @@ -135,7 +138,7 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ @@ -145,14 +148,14 @@ endif depend: .depend clean: -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifdef BOARDMAKE +ifeq ($(BOARDMAKE),y) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend |