[Tinyos-2-commits] CVS: tinyos-2.x/support/make/avr avr.rules, 1.15, 1.16

[John Regehr]

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

Modified Files:
	avr.rules 
Log Message:
safe tinyos compilation flags now live here, as they should

Index: avr.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/avr.rules,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** avr.rules	22 May 2008 23:56:08 -0000	1.15
--- avr.rules	4 Jun 2008 04:59:46 -0000	1.16
***************
*** 25,31 ****
  
  ifdef MAKE_DEPUTY_FLAG
!         NCC_SAFE_TINYOS_FLAG = -safe
  else
!         NCC_SAFE_TINYOS_FLAG =
  endif
  
--- 25,31 ----
  
  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 
  else
!         NCC_SAFE_TINYOS_FLAGS =
  endif
  
***************
*** 139,143 ****
  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)
--- 139,143 ----
  exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(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)