|
Lines 1-5
Link Here
|
| 1 |
--- ./SConstruct.orig 2014-08-22 14:25:14.780951671 -0500 |
1 |
--- SConstruct.orig 2014-12-02 06:28:17.000000000 +0300 |
| 2 |
+++ ./SConstruct 2014-08-22 14:25:37.478948513 -0500 |
2 |
+++ SConstruct 2014-12-02 06:28:31.000000000 +0300 |
| 3 |
@@ -26,7 +26,7 @@ |
3 |
@@ -26,7 +26,7 @@ |
| 4 |
if platform == 'linux-gcc': |
4 |
if platform == 'linux-gcc': |
| 5 |
CXX = 'g++' # not quite right, but env is not yet available. |
5 |
CXX = 'g++' # not quite right, but env is not yet available. |
|
Lines 9-14
Link Here
|
| 9 |
platform = 'linux-gcc-%s' %version |
9 |
platform = 'linux-gcc-%s' %version |
| 10 |
print "Using platform '%s'" %platform |
10 |
print "Using platform '%s'" %platform |
| 11 |
LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') |
11 |
LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') |
|
|
12 |
@@ -65,7 +65,7 @@ |
| 13 |
return vars |
| 14 |
|
| 15 |
|
| 16 |
-env = Environment( ENV = make_environ_vars(), |
| 17 |
+env = Environment( ENV = os.environ, |
| 18 |
toolpath = ['scons-tools'], |
| 19 |
tools=[] ) #, tools=['default'] ) |
| 20 |
|
| 12 |
@@ -121,6 +121,7 @@ |
21 |
@@ -121,6 +121,7 @@ |
| 13 |
env.Tool( 'default' ) |
22 |
env.Tool( 'default' ) |
| 14 |
env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) |
23 |
env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) |