summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonid Lisovskiy <lly.dev@gmail.com>2016-05-26 20:06:36 +0300
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-05-28 21:47:17 +0200
commite517397535b0777568fd9c13c4214b63c52d0798 (patch)
tree9379bb9cf9bb602890b73c968aeefedc88919aaa
parent77d003b6da2346e8da58c4535d81fe59f8da75b6 (diff)
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 <lly.dev@gmail.com>
-rw-r--r--Rules.mak2
1 files changed, 1 insertions, 1 deletions
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