From 7da4d1e7553a766f2ddc6a9a7d36423c1cf68a80 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 13 Apr 2011 10:26:38 +0200 Subject: buildsys: do not use $(and) make-3.80 does not have $(and) and $(or), so workaround for now. Signed-off-by: Bernhard Reutner-Fischer --- Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index 0aa684342..49ca2072a 100644 --- a/Rules.mak +++ b/Rules.mak @@ -531,7 +531,7 @@ ifdef LD_FLAG_NO_ASNEEDED export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif endif -link.asneeded = $(if $(and $(CC_FLAG_ASNEEDED),$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) +link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(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