f4b1e5049fd885f30df4c9c67e3eaa835b4ab3f3

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 205ef6b2ba5ae6d3940e55fe2cdb12f596b6154b..d44058b769d8d04dc55d5a021800e460f292eeed 100644 (file)
--- 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 bfac68f8df111f21f31d871bb021296bf87d0285..080651c1d79a6c0fce7c0fc702abdafede89f1b6 100644 (file)
--- 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