X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tools%2Ftinyos%2Fncc%2Fncc.in;h=2f61d921400ce5f896b6b7aeb4f5d6b2b6e3db80;hb=d6d83c617e77e45d8ad7e59bbde3adcd7d75fc5c;hp=df2ffb16763453c43bf8f244cd2068db3ee4027d;hpb=1527aea8e1f78378053819215708be7923c92a40;p=tinyos-2.x.git

diff --git a/tools/tinyos/ncc/ncc.in b/tools/tinyos/ncc/ncc.in
index df2ffb16..2f61d921 100644
--- a/tools/tinyos/ncc/ncc.in
+++ b/tools/tinyos/ncc/ncc.in
@@ -82,10 +82,6 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 	    $strip = 1;
 	    push @includes, $file;
 	}
-        elsif (/^-safe$/) {
-            $safe = 1;
-            $_ = "-fnesc-safe";
-        }
 	elsif (/^-fnesc-cfile=(.*)/){
 	    $appfilename=$1;
 	}
@@ -139,34 +135,6 @@ if (!defined $target) {
     }
 }
 
-if ($safe) {
-
-    my $safe_home = $ENV{'TOSDIR'}."/lib/safe";
-
-    if (($target eq "mica2") or ($target eq "micaz")) {
-	$mcu = "avr";
-    } elsif ($target eq "telosb") {
-	$mcu = "msp430";
-    } else {
-	print STDERR "Safe TinyOS does not (yet) support the ${target} target.\n";
-	print STDERR "Supported targets: ";
-	print STDERR "mica2, micaz, telosb\n";
-	exit 2;
-    }
-
-    push @new_args, "-fnesc-deputy";
-
-    $failfile = "${TOSDIR}/lib/safe/${mcu}/fail.c";
-
-    my $deputy_args = "-I${safe_home}/include " .
-                      "--FLIDs " . 
-                      "--envmachine " .
-                      "-DSAFE_TINYOS " .
-                      "--nolib";
-    push @new_args, "-fnesc-deputy-args=$deputy_args";
-    push @new_args, "$failfile";
-}
-
 if (!defined $scheduler && !$is_tos_1) {
 	$scheduler = "TinySchedulerC,TinySchedulerC.TaskBasic,TaskBasic,TaskBasic,runTask,postTask";
 }
@@ -180,6 +148,15 @@ if ($print_target) {
 foreach $dir (@includes) {
     if ($dir =~ m!/$target/?$! && -f "$dir/.platform") {
 	$platform_def = "$dir/.platform";
+	# Check to see if the platform is a member of a family
+	if (-f "$dir/.family") {
+	    $family_def = "$dir/.family";
+	}
+	else {
+	    if (-f "$dir/../.family") {
+		$family_def = "$dir/../.family";
+	    }
+	}
 	last;
     }
 }