diff options
author | px4dev <px4@purgatory.org> | 2012-10-15 21:08:26 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-10-15 21:08:26 -0700 |
commit | 3292ea24a16ebd65350e9f0c618fde4b2b4e8a97 (patch) | |
tree | 94d5ec2907a0bb56c5a1c902e98519ff2e9eb889 /nuttx | |
parent | f9a8818d1e040bdf1a4bb62041a469ceee67dbf4 (diff) | |
download | px4-firmware-3292ea24a16ebd65350e9f0c618fde4b2b4e8a97.tar.gz px4-firmware-3292ea24a16ebd65350e9f0c618fde4b2b4e8a97.tar.bz2 px4-firmware-3292ea24a16ebd65350e9f0c618fde4b2b4e8a97.zip |
Switch to the standard 'verbose' build option. Use a better way of passing options to the linker that is closer to friendly with 'make export'.
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index 00a489eab..ff2e4c5fa 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -116,7 +116,6 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION += -g -ARCHSCRIPT += -g endif ARCHCFLAGS = -std=gnu99 @@ -149,7 +148,7 @@ ARCHDEFINES = ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 # this seems to be the only way to add linker flags -ARCHSCRIPT += --warn-common \ +EXTRA_LIBS += --warn-common \ --gc-sections CFLAGS = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common @@ -167,13 +166,6 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -# If VERBOSE is set, don't hide the compiler invocations. -ifeq ($(VERBOSE),YES) -_v = -else -_v = @ -endif - define PREPROCESS @echo "CPP: $1->$2" @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 @@ -181,17 +173,17 @@ endef define COMPILE @echo "CC: $1" - $(_v)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 + $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 endef define COMPILEXX @echo "CXX: $1" - $(_v)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 + $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 endef define ASSEMBLE @echo "AS: $1" - $(_v)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 + $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 endef # produce partially-linked $1 from files in $2 |