From: regehr <regehr>
Date: Sun, 22 Jun 2008 04:31:34 +0000 (+0000)
Subject: eliminate option that defaults unlabeled modules to safe when compiling for safe... 
X-Git-Tag: release_tinyos_2_1_0_0~212
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=531873da4258e79801817651376540bc3b11ccc3

eliminate option that defaults unlabeled modules to safe when compiling for safe tinyos
---

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 990170c9..cce05362 100644
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -24,7 +24,7 @@ endef
 HELP += $(AVR_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        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 
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/avr/fail.c 
 else
         NCC_SAFE_TINYOS_FLAGS =
 endif
diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 7c52f32b..316c2e18 100644
--- 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-default-safe -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
 else
         NCC_SAFE_TINYOS_FLAGS =
 endif