diff options
Diffstat (limited to 'nuttx/configs/px4fmu/common/Make.defs')
-rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index 3d2df6314..b289f8960 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -39,12 +39,15 @@ # Make.defs in the per-config directories. # +include ${TOPDIR}/tools/Config.mk + # # We only support building with the ARM bare-metal toolchain from # https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS. # +CONFIG_ARMV7M_TOOLCHAIN := GNU_EABI -CROSSDEV = arm-none-eabi- +include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs CC = $(CROSSDEV)gcc CXX = $(CROSSDEV)g++ @@ -167,25 +170,34 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -define PREPROCESS - @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 -endef - -define COMPILE - @echo "CC: $1" - $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 -endef - -define COMPILEXX - @echo "CXX: $1" - $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 -endef - -define ASSEMBLE - @echo "AS: $1" - $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 -endef +#define PREPROCESS +# @echo "CPP: $1->$2" +# @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 +#endef +# +#define COMPILE +# @echo "CC: $1" +# $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 +#endef +# +#define COMPILEXX +# @echo "CXX: $1" +# $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 +#endef +# +#define ASSEMBLE +# @echo "AS: $1" +# $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 +#endef +# +#define ARCHIVE +# echo "AR: $2"; \ +# $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } +#endef +# +#define CLEAN +# @rm -f *.o *.a +#endef # produce partially-linked $1 from files in $2 define PRELINK @@ -193,15 +205,6 @@ define PRELINK @$(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1 endef -define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } -endef - -define CLEAN - @rm -f *.o *.a -endef - HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe |