OSDN Git Service

buildsys: do not use $(and)
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 13 Apr 2011 08:26:38 +0000 (10:26 +0200)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 13 Apr 2011 08:26:38 +0000 (10:26 +0200)
make-3.80 does not have $(and) and $(or), so workaround for now.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Rules.mak

index 0aa6843..49ca207 100644 (file)
--- 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