diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-19 23:36:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-19 23:36:26 +0000 |
| commit | f68c474e8ae9cfa5c9124a6eb92ec06fe2bf40a1 (patch) | |
| tree | 136f61c7ed1b2849839e1e5a9221884e38f97264 | |
| parent | 1dd1cc506aa2f85dc12a4485f738cc149118935a (diff) | |
| download | nuttx-f68c474e8ae9cfa5c9124a6eb92ec06fe2bf40a1.tar.gz nuttx-f68c474e8ae9cfa5c9124a6eb92ec06fe2bf40a1.tar.bz2 nuttx-f68c474e8ae9cfa5c9124a6eb92ec06fe2bf40a1.zip | |
Fix nxflat build error on Ubuntu
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3404 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/Makefile | 6 | ||||
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/nxflat.mk | 10 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/misc/buildroot/toolchain/nxflat/Makefile b/misc/buildroot/toolchain/nxflat/Makefile index fd9932f0a..7b677c12c 100644 --- a/misc/buildroot/toolchain/nxflat/Makefile +++ b/misc/buildroot/toolchain/nxflat/Makefile @@ -1,7 +1,7 @@ ############################################################################ # toolchain/nxflat/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ # ############################################################################ -CFLAGS += -Wall -I. -I$(BINUTILS_DIR)/bfd -LDFLAGS += -L$(BINUTILS_DIR)/bfd -L$(BINUTILS_DIR)/libiberty +CFLAGS += -Wall -I. -I$(BINUTILS_DIR1)/bfd -I$(BINUTILS_DIR)/include +LDFLAGS += -L$(BINUTILS_DIR1)/bfd -L$(BINUTILS_DIR1)/libiberty LIBS = -lbfd -lc -liberty -lz LDNXFLAT_OBJS = ldnxflat.o diff --git a/misc/buildroot/toolchain/nxflat/nxflat.mk b/misc/buildroot/toolchain/nxflat/nxflat.mk index f9df712f2..307a96fca 100644 --- a/misc/buildroot/toolchain/nxflat/nxflat.mk +++ b/misc/buildroot/toolchain/nxflat/nxflat.mk @@ -1,7 +1,7 @@ ############################################################################ # toolchain/nxflat/nxflat.mk # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -38,12 +38,12 @@ NXFLAT_DIR = $(TOPDIR)/toolchain/nxflat $(NXFLAT_DIR)/.compiled: ifeq ($(strip $(BR2_GCC_TARGET_ARCH)),"armv7-m") echo "NUTTX_DIR: $(NUTTX_DIR)" - $(MAKE) -C $(NXFLAT_DIR) BINUTILS_DIR="$(BINUTILS_DIR1)" \ - ARCH=thumb2 CC="$(HOSTCC)" + $(MAKE) -C $(NXFLAT_DIR) BINUTILS_DIR="$(BINUTILS_DIR)" \ + BINUTILS_DIR1="$(BINUTILS_DIR1)" ARCH=thumb2 CC="$(HOSTCC)" else echo "NUTTX_DIR: $(NUTTX_DIR)" - $(MAKE) -C $(NXFLAT_DIR) BINUTILS_DIR="$(BINUTILS_DIR1)" \ - ARCH=$(BR2_ARCH) CC="$(HOSTCC)" + $(MAKE) -C $(NXFLAT_DIR) BINUTILS_DIR="$(BINUTILS_DIR)" \ + BINUTILS_DIR1="$(BINUTILS_DIR1)" ARCH=$(BR2_ARCH) CC="$(HOSTCC)" endif touch $@ diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 6d7414d3a..37e22a008 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -2250,6 +2250,7 @@ buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr> under Cygwin. * Makefile - Alter copy arguements to avoid permissions problems when copying NuttX header files. + * toolchain/nxflat/nxflat.mk and Makefile - Fix include paths. </pre></ul> <table width ="100%"> |