Switch msp430 platforms to __ as nesC separator instead of $

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

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 04b090774595bfa8d43ec605c9fa1f56297ce2fb..5b53463e04e2d9eb7609246e301608ee5663c7b0 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -23,7 +23,7 @@ endef
 HELP += $(MSP_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs=build/$(PLATFORM)/flids.txt --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -I$(TOSDIR)/lib/safe -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs=build/$(PLATFORM)/flids.txt --envmachine -DSAFE_TINYOS --nolib '
 else
         NCC_SAFE_TINYOS_FLAGS =
 endif
@@ -39,6 +39,11 @@ SET_ID = tos-set-symbols
 NCC = ncc
 LIBS = -lm
 
+# Use __ as the separator - requires nesC 1.2.9 or later
+ifneq ($(filter sim,$(GOALS)),sim)
+        PFLAGS += -fnesc-separator=__
+endif
+
 AMADDR = ActiveMessageAddressC\$$addr
 BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe