Our environment is already sanitized, so don't kill it.

This commit is contained in:
joerg 2009-12-30 13:19:58 +00:00
parent 5e7936e550
commit 4caefcb91c
2 changed files with 14 additions and 5 deletions

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.5 2009/08/03 13:28:22 joerg Exp $
$NetBSD: distinfo,v 1.6 2009/12/30 13:19:58 joerg Exp $
SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
Size (Csound5.01_src.tar.gz) = 2031426 bytes
SHA1 (patch-ac) = 0ece70604a7d71ece78b5af65420a53adc381d3c
SHA1 (patch-ac) = a52a86dd8fed44ac3d72ef09e4de4224b2146c31
SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a
SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595
SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c

View file

@ -1,7 +1,7 @@
$NetBSD: patch-ac,v 1.3 2007/01/02 12:53:55 rillig Exp $
$NetBSD: patch-ac,v 1.4 2009/12/30 13:19:58 joerg Exp $
--- SConstruct.orig 2006-03-15 16:22:43.000000000 +0100
+++ SConstruct 2007-01-02 13:32:42.000000000 +0100
--- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000
+++ SConstruct
@@ -50,6 +50,10 @@ def today():
def getPlatform():
if sys.platform[:5] == 'linux':
@ -13,6 +13,15 @@ $NetBSD: patch-ac,v 1.3 2007/01/02 12:53:55 rillig Exp $
elif sys.platform[:3] == 'win':
return 'mingw'
elif sys.platform[:6] == 'darwin':
@@ -207,7 +211,7 @@ opts.Add('buildOSXGUI',
# This section also sets up customized options for third-party libraries, which
# should take priority over default options.
-commonEnvironment = Environment(options = opts, ENV = {'PATH' : os.environ['PATH']})
+commonEnvironment = Environment(options = opts, ENV = os.environ)
customCPPPATH = commonEnvironment['customCPPPATH']
commonEnvironment.Prepend(CPPPATH = customCPPPATH)
@@ -335,6 +339,15 @@ elif getPlatform() == 'mingw':
pythonLinkFlags = []
pythonLibraryPath = []