[git commit future] buildsys: do not use $(and)

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Apr 13 17:38:40 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=7da4d1e7553a766f2ddc6a9a7d36423c1cf68a80
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

make-3.80 does not have $(and) and $(or), so workaround for now.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Rules.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index 0aa6843..49ca207 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
-- 
1.7.3.4



More information about the uClibc-cvs mailing list