diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
| commit | 96e153c0d29b1ab3657948e280faa25e864b28c5 (patch) | |
| tree | 121d4fdf55df9d292c0d1d3971b2c5252cf39eaa /nuttx/arch/x86/src | |
| parent | dab0480f31b5fe4d778a414f3b60e5c5b536b1bd (diff) | |
| download | px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.gz px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.bz2 px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.zip | |
Correct some issues with last check-in; ez80 still does not build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/x86/src')
| -rw-r--r-- | nuttx/arch/x86/src/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile index 11bd3091d..a979593ee 100644 --- a/nuttx/arch/x86/src/Makefile +++ b/nuttx/arch/x86/src/Makefile @@ -69,32 +69,32 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" ifeq ($(HOSTOS),FreeBSD) HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"} @@ -143,24 +143,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend |