From e517397535b0777568fd9c13c4214b63c52d0798 Mon Sep 17 00:00:00 2001 From: Leonid Lisovskiy Date: Thu, 26 May 2016 20:06:36 +0300 Subject: buildsys: Fix broken link.asneeded function Both $(CC_FLAG_ASNEEDED) and $(CC_FLAG_NO_ASNEEDED) never become "y", must check for non-empty strings. To keep make 3.80 compatibility "$(if" used only. Fixes: 7da4d1e7 "buildsys: do not use $(and)". Signed-off-by: Leonid Lisovskiy --- Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index c3dac568f..4f829356a 100644 --- a/Rules.mak +++ b/Rules.mak @@ -535,7 +535,7 @@ ifdef LD_FLAG_NO_ASNEEDED export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif endif -link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) +link.asneeded = $(if $(CC_FLAG_ASNEEDED),$(if $(CC_FLAG_NO_ASNEEDED),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED))) # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) ifndef ASNEEDED -- cgit v1.2.3