aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorMichal Ulianko <michal.ulianko@gmail.com>2015-03-20 23:22:42 +0100
committerMichal Ulianko <michal.ulianko@gmail.com>2015-03-20 23:22:42 +0100
commit354809bff4da0ce2a74ca6a750fa15a3ff441847 (patch)
treee03409c8696e03ece533f32820f703e1f0612ee7 /makefiles
parentc5ae02deda839919841dee5c68db564c0b74c690 (diff)
downloadpx4-firmware-354809bff4da0ce2a74ca6a750fa15a3ff441847.tar.gz
px4-firmware-354809bff4da0ce2a74ca6a750fa15a3ff441847.tar.bz2
px4-firmware-354809bff4da0ce2a74ca6a750fa15a3ff441847.zip
BIN_TO_OBJ: Switch egrep and cut to $(GREP). Use posix format and decimal radix with $(NM).
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/toolchain_gnu-arm-eabi.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index 93ee235c4..033d6e1fe 100644
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@@ -324,7 +324,7 @@ define BIN_TO_OBJ
$(Q) $(ECHO) > $2.c
$(call COMPILE,$2.c,$2.c.o)
$(Q) $(LD) -r -o $2.bin.o $2.c.o -b binary $1
- $(Q) $(ECHO) "const unsigned int $3_len = 0x`$(NM) $2.bin.o | egrep $(call BIN_SYM_PREFIX,$1)_size$$ | cut -d' ' -f1`;" > $2.c
+ $(Q) $(ECHO) "const unsigned int $3_len = `$(NM) -p --radix=d $2.bin.o | $(GREP) $(call BIN_SYM_PREFIX,$1)_size$$ | $(GREP) -o ^[0-9]*`;" > $2.c
$(call COMPILE,$2.c,$2.c.o)
$(Q) $(LD) -r -o $2 $2.c.o $2.bin.o
$(Q) $(OBJCOPY) $2 \