Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / support / make / dynthreads.extra

diff --git a/support/make/dynthreads.extra b/support/make/dynthreads.extra
index e22a40d7e1a2860cbb8e6bcbbb0c547d219d9038..02e3ee844239d9154857022f206b10f9f0de454d 100644 (file)
--- a/support/make/dynthreads.extra
+++ b/support/make/dynthreads.extra
@@ -6,6 +6,7 @@ BUILD_DEPS = dynthreads_all
 
 #Get all the normal include directories for a cthreads build
 $(call TOSMake_include,cthreads.extra)
+PFLAGS += -DDYNTHREADS
 
 #Stuff to build dynamically loadable binary
 DYNLOAD_CFILE = $(TOSTHREAD_MAIN_PATH)
@@ -30,9 +31,15 @@ dynthreads_build: dynthreads_builddir build_storage
        $(DYNLOAD_OBJCOPY_COMMAND)
        $(DYNLOAD_GENTOS_COMMAND)
        
+ifneq ($(shell uname),Darwin)
+dynthreads_all: dynthreads_build
+       @echo "            $(shell stat -t $(DYNLOAD_TOSFILE) | perl -lane 'print $$F[1];') bytes in BINARY"
+       @echo "    writing TOS image"
+else
 dynthreads_all: dynthreads_build
        @echo "            $(shell stat -F $(DYNLOAD_TOSFILE) | perl -lane 'print $$F[4];') bytes in BINARY"
        @echo "    writing TOS image"
+endif
 
 dynthreads_builddir:
        mkdir -p $(BUILDDIR)