From d1156e0b967cf219f5bef8eef83792cd42cb1dd6 Mon Sep 17 00:00:00 2001 From: Steve Capper Date: Tue, 23 Jan 2018 03:30:05 +0000 Subject: [PATCH] Correct the Makefile logic for disabling PIE In the Makefile we use findstring to locate gcc toolchains that have PIE enabled by default. Unfortunately the result of findstring is compared against an integer, 1, rather than a non-empty string; the logic to disable PIE then doesn't get applied. This patch fixes the flag test. Fixes: f7ec31db2db3 ("Disable PIE compilation option") Change-Id: I4cd2866974e313d6b408f9681311d78a208ab468 Signed-off-by: Steve Capper --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1cd6b62cb..9600455eb 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \ GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) PIE_FOUND := $(findstring --enable-default-pie,${GCC_V_OUTPUT}) -ifeq ($(PIE_FOUND),1) +ifneq ($(PIE_FOUND),) TF_CFLAGS += -fno-PIE endif