safe tinyos compilation flags now live here, as they should

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index f00e0ff8b40d1ddaa26144e5eb12fdb083b73857..990170c9d08f2205a797fa227ae07aeceb3516d3 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -24,9 +24,9 @@ endef
 HELP += $(AVR_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        NCC_SAFE_TINYOS_FLAG = -safe
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-default-safe -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/avr/fail.c 
 else
-        NCC_SAFE_TINYOS_FLAG =
+        NCC_SAFE_TINYOS_FLAGS =
 endif
 
 OBJCOPY = avr-objcopy
@@ -138,7 +138,7 @@ exe: exe0 bytes FORCE
 
 exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
-       $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAG) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
+       $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE
        @nescc-wiring $(WIRING_CHECK_FILE)
 endif

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index d283faf596d6f5743bbf3cf357d5090ef7c4ff0f..7c52f32bd067003030d8f4d0efaae6bb014bffc3 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -23,9 +23,9 @@ endef
 HELP += $(MSP_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        NCC_SAFE_TINYOS_FLAG = -safe
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-default-safe -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
 else
-        NCC_SAFE_TINYOS_FLAG =
+        NCC_SAFE_TINYOS_FLAGS =
 endif
 
 #MSP_NESC_TARGET ?= msp430
@@ -102,7 +102,7 @@ exe: exe0 bytes FORCE
 
 exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
-       $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAG) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
+       $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE
        @nescc-wiring $(WIRING_CHECK_FILE)
 endif