From: regehr <regehr>
Date: Wed, 4 Jun 2008 04:59:46 +0000 (+0000)
Subject: safe tinyos compilation flags now live here, as they should
X-Git-Tag: release_tinyos_2_1_0_0~337
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=d3b1e008405b3c54918b861f81ef63cf70dc103c

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 f00e0ff8..990170c9 100644
--- 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 d283faf5..7c52f32b 100644
--- 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