wiring the wrong resource

[tinyos-2.x.git] / support / make / avr / avr.rules

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index dfbbcb10bab9ff0d5bbd7b0ea4fdf1ee80eefde6..a8c5d025884e010d877fcdd857d93649df303bba 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -36,7 +36,11 @@ NCC = ncc
 LIBS = -lm
 
 # Use __ as the separator - requires nesC 1.2.9 or later
-PFLAGS += -fnesc-separator=__
+ifneq ($(filter sim,$(GOALS)),sim)
+ifneq ($(filter sim-sf,$(GOALS)),sim-sf)
+       PFLAGS += -fnesc-separator=__
+endif
+endif
 AMADDR = ActiveMessageAddressC__addr
 BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe
@@ -64,6 +68,9 @@ else
 endif
 
 ifeq ($(PROGRAMMER),avrdude)
+  ifeq ($(findstring Darwin, $(shell uname)), Darwin)
+    AVRDUDE_CONF ?= /opt/local/etc/avrdude.conf
+  endif
   AVRDUDE_CONF ?= /etc/avrdude/avrdude.conf
   ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
     AVRDUDE_CONF := $(shell cygpath -m $(AVRDUDE_CONF))
@@ -141,7 +148,7 @@ ifdef WIRING_CHECK_FILE
 endif
 ifdef STACK_CHECK
        @echo
-       @tos-ramsize $(PLATFORM) $(MAIN_EXE)
+       @-tos-ramsize $(PLATFORM) $(MAIN_EXE)
        @echo
 endif
        @echo "    compiled $(COMPONENT) to $(MAIN_EXE)"