From: Michel Pollet <buserror@gmail.com>
Date: Sun, 2 Jun 2013 13:44:31 +0000 (+0100)
Subject: Makefile: Removed uname -o
X-Git-Tag: v1.1~21
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=f4b1e5049fd885f30df4c9c67e3eaa835b4ab3f3;p=sx%2Fsimavr.git

Makefile: Removed uname -o

This break on BSDs (aka OSX), this commit will break windows build, it
will need a proper fix

Signed-off-by: Michel Pollet <buserror@gmail.com>
---

diff --git a/Makefile.common b/Makefile.common
index 205ef6b..d44058b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -58,7 +58,11 @@ else
 AVR_ROOT 	:= /usr/lib/avr
 AVR_INC 	:= ${AVR_ROOT}
 AVR 		:= avr-
-ifeq (${shell uname -o}, Msys)
+
+# FIXME uname -o doesn't work on bsd derivatives
+#WIN := ${shell uname -o}
+
+ifeq (${WIN}, Msys)
 AVR_ROOT    := ${shell echo "${AVR32_HOME}" | tr '\\' '/'}
 AVR_INC     := ${AVR_ROOT}/avr
 AVR         := ${AVR_ROOT}/bin/avr-
@@ -89,7 +93,7 @@ LDFLAGS 	+= -L${LIBDIR} -lsimavr
 
 LDFLAGS 	+= -lelf 
 
-ifeq (${shell uname -o}, Msys)
+ifeq (${WIN}, Msys)
 LDFLAGS      += -lws2_32
 endif
 
diff --git a/simavr/Makefile b/simavr/Makefile
index bfac68f..080651c 100644
--- a/simavr/Makefile
+++ b/simavr/Makefile
@@ -79,11 +79,13 @@ endif
 ${OBJ}/${target}.elf	: ${OBJ}/${target}.o
 
 ${target}	: ${OBJ}/${target}.elf
-ifeq (${shell uname -o}, Msys)
-	ln -sf $< $@.exe
-else
+
+# FIXME uname -o doesn't work on BSD
+#ifeq (${shell uname -o}, Msys)
+#	ln -sf $< $@.exe
+#else
 	ln -sf $< $@
-endif
+#endif
  
 clean: clean-${OBJ}
 	rm -rf ${target} *.a *.so *.exe