]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
Update to work with some versions of darwin on mac os
authorklueska <klueska>
Mon, 25 Feb 2008 18:24:38 +0000 (18:24 +0000)
committerklueska <klueska>
Mon, 25 Feb 2008 18:24:38 +0000 (18:24 +0000)
support/make/sim.extra

index 2a17df0e05f11a8d11f01ac1b947717378d6ee25..10ee519569f113b070ba3aba36605eae26d09223 100644 (file)
@@ -35,12 +35,11 @@ ifeq ($(OS), Windows_NT) # Some TinyOS installs are like this
   PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
   PLATFORM_LIB_FLAGS =-shared -L/usr/lib/python$(PYTHON_VERSION)/config -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
 else 
-ifeq ($(findstring darwin, $(OSTYPE)), darwin)
-  PLATFORM_FLAGS=-fPIC
-  PLATFORM_CC_FLAGS=-bundle
-  SHARED_OBJECT=_TOSSIMmodule.so
-  PLATFORM_BUILD_FLAGS=-flat_namespace -undefined suppress 
-  PLATFORM_LIB_FLAGS = -lstdc++ 
+ifeq ($(findstring darwin, $(OSTYPE)), darwin) 
+  SIM_DARWIN=TRUE
+else
+ifeq ($(findstring Darwin, $(shell uname)), Darwin)
+  SIM_DARWIN = TRUE  
 else # linux
   PLATFORM_FLAGS=-shared -fPIC
   SHARED_OBJECT=_TOSSIMmodule.so
@@ -49,7 +48,15 @@ else # linux
 endif
 endif
 endif
+endif 
+ifdef SIM_DARWIN
+  PLATFORM_FLAGS=-fPIC
+  PLATFORM_CC_FLAGS=-bundle
+  SHARED_OBJECT=_TOSSIMmodule.so
+  PLATFORM_BUILD_FLAGS=-flat_namespace -undefined suppress 
+  PLATFORM_LIB_FLAGS = -lstdc++ 
+endif 
+
 BUILD_DEPS = sim-exe
 
 # lib/tossim has to come at the end in order to ensure basic TOSSIM