From f68c474e8ae9cfa5c9124a6eb92ec06fe2bf40a1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 19 Mar 2011 23:36:26 +0000 Subject: Fix nxflat build error on Ubuntu git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3404 42af7a65-404d-4744-a932-0658087f49c3 --- misc/buildroot/toolchain/nxflat/Makefile | 6 +++--- misc/buildroot/toolchain/nxflat/nxflat.mk | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'misc/buildroot/toolchain/nxflat') 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 # # 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 # # 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 $@ -- cgit v1.2.3