[CRIU] [PATCHv2 11/12] pie/build: Add CFLAGS_PIE to CFLAGS
Dmitry Safonov
dima at arista.com
Wed May 29 19:15:14 MSK 2019
There is a little difference between ccflags-y and CFLAGS, except the
local/global visibility: nmk adds $(CFLAGS) to nmk-asflags and assembles
using them, but without ccflags-y.
The other possible way would be adding asflags-y with CFLAGS_PIE, but
I'm not convinced - let's update CFLAGS for the time being.
Signed-off-by: Dmitry Safonov <dima at arista.com>
---
criu/pie/Makefile | 2 +-
criu/pie/Makefile.library | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index ade186346524..47443c26b3d8 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -5,7 +5,7 @@
target := parasite restorer
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
-ccflags-y += $(CFLAGS_PIE)
+CFLAGS += $(CFLAGS_PIE)
ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index b1ac600c6f18..d802417de288 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -29,4 +29,4 @@ ifeq ($(SRCARCH),arm)
endif
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
-ccflags-y += $(CFLAGS_PIE)
+CFLAGS += $(CFLAGS_PIE)
--
2.21.0
More information about the CRIU
mailing list