Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: Make invocation of host compiler correct #13

Open
wants to merge 1 commit into
base: rcar_gen3
Choose a base branch
from
Open

tools: Make invocation of host compiler correct #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions tools/cert_create/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
Expand All @@ -22,7 +22,7 @@ OBJECTS := src/cert.o \
src/tbbr/tbb_ext.o \
src/tbbr/tbb_key.o

CFLAGS := -Wall -std=c99
HOSTCCFLAGS := -Wall -std=c99

MAKE_HELPERS_DIRECTORY := ../../make_helpers/
include ${MAKE_HELPERS_DIRECTORY}build_macros.mk
Expand All @@ -46,9 +46,9 @@ endif
endif

ifeq (${DEBUG},1)
CFLAGS += -g -O0 -DDEBUG -DLOG_LEVEL=40
HOSTCCFLAGS += -g -O0 -DDEBUG -DLOG_LEVEL=40
else
CFLAGS += -O2 -DLOG_LEVEL=20
HOSTCCFLAGS += -O2 -DLOG_LEVEL=20
endif
ifeq (${V},0)
Q := @
Expand All @@ -57,7 +57,7 @@ else
endif

$(eval $(call add_define,USE_TBBR_DEFS))
CFLAGS += ${DEFINES}
HOSTCCFLAGS += ${DEFINES}

# Make soft links and include from local directory otherwise wrong headers
# could get pulled in from firmware tree.
Expand All @@ -72,15 +72,19 @@ HOSTCC ?= gcc
all: clean ${BINARY}

${BINARY}: ${OBJECTS} Makefile
@echo " LD $@"
@echo " HOSTLD $@"
@echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \
const char platform_msg[] = "${PLAT_MSG}";' | \
<<<<<<< HEAD
${CC} -c ${CFLAGS} -xc - -o src/build_msg.o
=======
${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o
>>>>>>> 750e8d8... tools: Make invocation of host compiler correct
${Q}${HOSTCC} src/build_msg.o ${OBJECTS} ${LIB_DIR} ${LIB} -o $@

%.o: %.c
@echo " CC $<"
${Q}${HOSTCC} -c ${CFLAGS} ${INC_DIR} $< -o $@
@echo " HOSTCC $<"
${Q}${HOSTCC} -c ${HOSTCCFLAGS} ${INC_DIR} $< -o $@

clean:
$(call SHELL_DELETE_ALL, src/build_msg.o ${OBJECTS})
Expand Down
14 changes: 7 additions & 7 deletions tools/fiptool/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
Expand All @@ -13,11 +13,11 @@ OBJECTS := fiptool.o tbbr_config.o
V ?= 0

override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700
CFLAGS := -Wall -Werror -pedantic -std=c99
HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99
ifeq (${DEBUG},1)
CFLAGS += -g -O0 -DDEBUG
HOSTCCFLAGS += -g -O0 -DDEBUG
else
CFLAGS += -O2
HOSTCCFLAGS += -O2
endif
LDLIBS := -lcrypto

Expand All @@ -36,7 +36,7 @@ HOSTCC ?= gcc
all: ${PROJECT} fip_create

${PROJECT}: ${OBJECTS} Makefile
@echo " LD $@"
@echo " HOSTLD $@"
${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
@${ECHO_BLANK_LINE}
@echo "Built $@ successfully"
Expand All @@ -47,8 +47,8 @@ fip_create: fip_create.sh
${Q}install -m 755 fip_create.sh ../fip_create/fip_create

%.o: %.c %.h Makefile
@echo " CC $<"
${Q}${HOSTCC} -c ${CPPFLAGS} ${CFLAGS} ${INCLUDE_PATHS} $< -o $@
@echo " HOSTCC $<"
${Q}${HOSTCC} -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@

clean:
$(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS} fip_create)