blob: 9c6b10693669f64af3fdbe0a00320566baa6b0bc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 591461d6efe51989b4a7f4e875cdf37505eba360 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.z@gmail.com>
Date: Thu, 4 Jun 2020 19:24:05 +0000
Subject: [PATCH] flags: do not override CFLAGS from host
Some build systems set CFLAGS in environment before the build, but they
got overridden by CFLAGS immediate assignment operator.
Replace immediate assignment with append directive and use override
directive, so the former definition of CFLAGS gets passed either from
command line or via environment is completely expanded (see [1] for
detailed explanation of override directive and variable append).
Link: [1] https://www.gnu.org/software/make/manual/html_node/Override-Directive.html
Upstream-Status: Backport [https://github.com/OP-TEE/optee_client/pull/211]
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
---
flags.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/flags.mk b/flags.mk
index c2f0e1c..65192bc 100644
--- a/flags.mk
+++ b/flags.mk
@@ -6,7 +6,7 @@ CROSS_COMPILE ?= arm-linux-gnueabihf-
CC ?= $(CROSS_COMPILE)gcc
AR ?= $(CROSS_COMPILE)ar
-CFLAGS := -Wall -Wbad-function-cast -Wcast-align \
+override CFLAGS += -Wall -Wbad-function-cast -Wcast-align \
-Werror-implicit-function-declaration -Wextra \
-Wfloat-equal -Wformat-nonliteral -Wformat-security \
-Wformat=2 -Winit-self -Wmissing-declarations \
@@ -16,13 +16,13 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \
-Wswitch-default -Wunsafe-loop-optimizations \
-Wwrite-strings -D_FILE_OFFSET_BITS=64
ifeq ($(CFG_WERROR),y)
-CFLAGS += -Werror
+override CFLAGS += -Werror
endif
-CFLAGS += -c -fPIC
+override CFLAGS += -c -fPIC
DEBUG ?= 0
ifeq ($(DEBUG), 1)
-CFLAGS += -DDEBUG -O0 -g
+override CFLAGS += -DDEBUG -O0 -g
endif
RM := rm -f
--
2.17.1
|
