From 22647f3068a04d0d4d3ea5d6d80e243d6e8a2b15 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 8 Jul 2009 18:40:10 +0000
Subject: [PATCH] add env inheritance back to SCons (as discussed with artem to
 enable finding libraries and programs in custom locations)

---
 SConstruct | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index ec4c3e373..018190f07 100644
--- a/SConstruct
+++ b/SConstruct
@@ -35,7 +35,7 @@ except:
     HAS_DISTUTILS = False
 
 #### SCons build options and initial setup ####
-env = Environment()
+env = Environment(ENV=os.environ)
 
 def color_print(color,text,newline=True):
     # 1 - red
@@ -537,7 +537,7 @@ if not preconfigured:
                     # but if the default is overridden and the file is not found, give warning
                     color_print(1,"SCons CONFIG not found: '%s'" % conf)
             # Recreate the base environment using modified `opts`
-            env = Environment(options=opts)
+            env = Environment(ENV=os.environ,options=opts)
             env['USE_CONFIG'] = True
     else:
         color_print(4,'SCons USE_CONFIG specified as false, will not inherit variables python config file...')