Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / support / make / sim.extra

diff --git a/support/make/sim.extra b/support/make/sim.extra
index 10ee519569f113b070ba3aba36605eae26d09223..8e6e92c5196a4fbb611bb37cd98a30cbb5854c0c 100644 (file)
--- a/support/make/sim.extra
+++ b/support/make/sim.extra
@@ -1,11 +1,11 @@
 #-*-Makefile-*- vim:syntax=make
 #$Id$
 
-GCC=gcc
+export GCC=gcc
 GPP=g++
 OPTFLAGS = -g -O0
 LIBS = -lm -lstdc++ 
-PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)  
+PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\) -fnesc-gcc=$(GCC)
 WFLAGS = -Wno-nesc-data-race
 PYTHON_VERSION=2.5
 
@@ -18,7 +18,7 @@ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
 HASHOBJFILE = $(BUILDDIR)/c-support.o
 PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
 PYOBJFILE  = $(BUILDDIR)/pytossim.o
-PYDIR      =/usr/include/python$(PYTHON_VERSION)
+PYDIR      = $(shell python$(PYTHON_VERSION)-config --prefix)/include/python$(PYTHON_VERSION)
 SIMDIR     =$(TOSDIR)/lib/tossim
 XML        = app.xml
 DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags
@@ -50,7 +50,7 @@ endif
 endif
 endif 
 ifdef SIM_DARWIN
-  PLATFORM_FLAGS=-fPIC
+  PLATFORM_FLAGS=-fPIC -D_FORTIFY_SOURCE=0
   PLATFORM_CC_FLAGS=-bundle
   SHARED_OBJECT=_TOSSIMmodule.so
   PLATFORM_BUILD_FLAGS=-flat_namespace -undefined suppress