diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 13:52:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 13:52:31 +0000 |
commit | 3ceb882b97a3080425f564a579a9f53a9422ee7c (patch) | |
tree | 4810930700e4d926fadb43e9472bd1d971e1e3e6 /nuttx/arch/arm | |
parent | 3bf4cd0abd093be0b3f2bac724aa952dc1b1bb60 (diff) | |
download | px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.tar.gz px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.tar.bz2 px4-firmware-3ceb882b97a3080425f564a579a9f53a9422ee7c.zip |
arch/../src/Makefiles now use only libraries in lib/
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5333 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r-- | nuttx/arch/arm/src/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index f356f4d02..49fabb708 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -74,16 +74,17 @@ LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= EXTRA_LIBPATHS ?= +LINKLIBS ?= -LINKLIBS = ifeq ($(WINTOOL),y) - LIBPATHS = ${shell for path in $(LINKLIBS); do dir=`dirname $(TOPDIR)/$$path`;echo "-L\"`cygpath -w $$dir`\"";done} + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" else - LIBPATHS = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS))) + LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(BOARDDIR)" endif -LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS)))) + +LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board |