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 | dd91ab3f35500a0a13a7dced870ea5c6f9ad3765 (patch) | |
| tree | 2f38b418f4df4610fc87f117e7e8be9996710da0 /nuttx/arch/sim/src | |
| parent | 96e153c0d29b1ab3657948e280faa25e864b28c5 (diff) | |
| download | px4-nuttx-dd91ab3f35500a0a13a7dced870ea5c6f9ad3765.tar.gz px4-nuttx-dd91ab3f35500a0a13a7dced870ea5c6f9ad3765.tar.bz2 px4-nuttx-dd91ab3f35500a0a13a7dced870ea5c6f9ad3765.zip | |
A few more build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5340 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim/src')
| -rw-r--r-- | nuttx/arch/sim/src/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 4841abd50..d46defe13 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -127,14 +127,14 @@ endif # Most are provided by LINKLIBS on the MAKE command line LINKLIBS ?= -LIBPATHS += -L"$(TOPDIR)/lib" -LIBPATHS += -Lboard -LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) +RELLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) +RELPATHS += -L"$(TOPDIR)/lib" # Add the board-specific library and directory -LDPATHS += -L board -LDLIBS += -lboard +LIBPATHS += -L board +RELPATHS += -L board +RELLIBS += -lboard # Make targets begin here @@ -178,7 +178,7 @@ Cygwin-names.dat: nuttx-names.dat nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKOBJS) $(Q) echo "LD: nuttx.rel" - $(Q) $(LD) -r $(LDLINKFLAGS) $(LDPATHS) $(EXTRA_LIBPATHS) -o $@ $(REQUIREDOBJS) --start-group $(LDLIBS) $(EXTRA_LIBS) --end-group + $(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o $@ $(REQUIREDOBJS) --start-group $(RELLIBS) $(EXTRA_LIBS) --end-group $(Q) $(OBJCOPY) --redefine-syms=$(HOSTOS)-names.dat $@ # Generate the final NuttX binary by linking the host-specific objects with the NuttX @@ -186,7 +186,7 @@ nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKO nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS) $(Q) echo "LD: nuttx$(EXEEXT)" - $(Q) "$(CC)" $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS) + $(Q) "$(CC)" $(CCLINKFLAGS) $(LIBPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS) $(Q) $(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map |