summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2011-04-13 10:26:38 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2011-04-13 10:26:38 +0200
commit7da4d1e7553a766f2ddc6a9a7d36423c1cf68a80 (patch)
tree5d1c586fcd7d75cce1bd96694d64b5ed53262fa1
parenta4a4912b180c03e5f0ca7d6f05be97492b6983e1 (diff)
buildsys: do not use $(and)
make-3.80 does not have $(and) and $(or), so workaround for now. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--Rules.mak2
1 files changed, 1 insertions, 1 deletions
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