[Tinyos-2-commits] CVS: tinyos-2.x/support/make/msp msp.rules, 1.7, 1.8

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/support/make/msp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27792

Modified Files:
	msp.rules 
Log Message:
pass -safe flag on to ncc

Index: msp.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/msp/msp.rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** msp.rules	1 Feb 2008 20:25:37 -0000	1.7
--- msp.rules	16 Feb 2008 19:49:05 -0000	1.8
***************
*** 23,26 ****
--- 23,32 ----
  HELP += $(MSP_HELP)
  
+ ifdef MAKE_DEPUTY_FLAG
+         NCC_SAFE_TINYOS_FLAG = -safe
+ else
+         NCC_SAFE_TINYOS_FLAG =
+ endif
+ 
  #MSP_NESC_TARGET ?= msp430
  #MSP_GCC ?= msp430-gcc
***************
*** 90,94 ****
  exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
  ifdef WIRING_CHECK_FILE
  	@nescc-wiring $(WIRING_CHECK_FILE)
--- 96,100 ----
  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)
  ifdef WIRING_CHECK_FILE
  	@nescc-wiring $(WIRING_CHECK_FILE)