diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-03-31 14:00:10 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-31 14:00:10 +0000 |
| commit | a7062b7daa0ec5538a3b32b5fb810fdf8e27ff41 (patch) | |
| tree | 461634be56afcf6a09620b762a352560bd41d1b1 | |
| parent | 27c5e15ee4b5d4b57852667ef362d9821349547b (diff) | |
| parent | 32b209bfea25f6372894edc528d526070bb14e22 (diff) | |
| download | platform_external_arm-trusted-firmware-a7062b7daa0ec5538a3b32b5fb810fdf8e27ff41.tar.gz platform_external_arm-trusted-firmware-a7062b7daa0ec5538a3b32b5fb810fdf8e27ff41.tar.bz2 platform_external_arm-trusted-firmware-a7062b7daa0ec5538a3b32b5fb810fdf8e27ff41.zip | |
Merge "Makefile: don't use $(CC) before value is explicit set" into integration
| -rw-r--r-- | Makefile | 40 |
1 files changed, 20 insertions, 20 deletions
@@ -84,26 +84,6 @@ endif export Q ECHO -# Process Debug flag -$(eval $(call add_define,DEBUG)) -ifneq (${DEBUG}, 0) - BUILD_TYPE := debug - TF_CFLAGS += -g - - ifneq ($(findstring clang,$(notdir $(CC))),) - ASFLAGS += -g - else - ASFLAGS += -g -Wa,--gdwarf-2 - endif - - # Use LOG_LEVEL_INFO by default for debug builds - LOG_LEVEL := 40 -else - BUILD_TYPE := release - # Use LOG_LEVEL_NOTICE by default for release builds - LOG_LEVEL := 20 -endif - # Default build string (git branch and commit) ifeq (${BUILD_STRING},) BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null) @@ -243,6 +223,26 @@ TF_CFLAGS_aarch64 = $(march64-directive) LD = $(LINKER) endif +# Process Debug flag +$(eval $(call add_define,DEBUG)) +ifneq (${DEBUG}, 0) + BUILD_TYPE := debug + TF_CFLAGS += -g + + ifneq ($(findstring clang,$(notdir $(CC))),) + ASFLAGS += -g + else + ASFLAGS += -g -Wa,--gdwarf-2 + endif + + # Use LOG_LEVEL_INFO by default for debug builds + LOG_LEVEL := 40 +else + BUILD_TYPE := release + # Use LOG_LEVEL_NOTICE by default for release builds + LOG_LEVEL := 20 +endif + ifeq (${AARCH32_INSTRUCTION_SET},A32) TF_CFLAGS_aarch32 += -marm else ifeq (${AARCH32_INSTRUCTION_SET},T32) |