From d40abb2504b99e1318840ad1a5d9f4a340c465b5 Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Thu, 27 Nov 2008 06:27:47 -0500
Subject: tinderbox: Don't alter SunOS path if we're building off a repository
 tree

SunOS make will work only out of snapshots and releases.
---
 tools/tinderbox_build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index ab4234aa..5035b603 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -234,8 +234,10 @@ sub SetupPath {
     $Path = $ENV{PATH};
     print "Path before: $Path\n";
 
-    if ( $OS eq 'SunOS' ) {
-	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    # Don't alter path if we're building off a repository tree;
+    # SunOS make will work only out of snapshots and releases.
+    if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
+        $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
     }
 
     $Path = $ENV{PATH};
-- 
cgit v1.2.3