Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 06:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: Fix broken object compilation rules

Browse source 
As these rules depend on non-existing headers as well (likely copy &
pasted from fiptool), they never matched, and the built-in rules were
used. That led to random breakages when e.g. CPPFLAGS was suddenly
evaluated and contained invalid options.

For the stm32image, this reveals that we were relying on the built-in
rules by passing -D_GNU_SOURCE via CPPFLAGS, rather than using CFLAGS as
used in the local rule. Fix that as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2018-10-02 09:28:00 +02:00 • committed by Konstantin Porotchkin
parent 37c4341b10
commit c0f73edc9b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/doimage/Makefile
View file

@ -39,7 +39,7 @@ ${PROJECT}: ${OBJECTS} Makefile
@echo "Built $@ successfully" @echo "Built $@ successfully"
@echo @echo
%.o: %.c %.h Makefile %.o: %.c Makefile
@echo " CC $<" @echo " CC $<"
${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@ ${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@

5
tools/stm32image/Makefile
View file

@ -12,8 +12,7 @@ PROJECT := stm32image${BIN_EXT}
OBJECTS := stm32image.o OBJECTS := stm32image.o
V := 0 V := 0
override CPPFLAGS += -D_GNU_SOURCE CFLAGS := -Wall -Werror -pedantic -std=c99 -D_GNU_SOURCE
CFLAGS := -Wall -Werror -pedantic -std=c99
ifeq (${DEBUG},1) ifeq (${DEBUG},1)
CFLAGS += -g -O0 -DDEBUG CFLAGS += -g -O0 -DDEBUG
else else
@ -39,7 +38,7 @@ ${PROJECT}: ${OBJECTS} Makefile
@echo "Built $@ successfully" @echo "Built $@ successfully"
@${ECHO_BLANK_LINE} @${ECHO_BLANK_LINE}
%.o: %.c %.h Makefile %.o: %.c Makefile
@echo " CC $<" @echo " CC $<"
${Q}${CC} -c ${CFLAGS} $< -o $@ ${Q}${CC} -c ${CFLAGS} $< -o $@