1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From e71e75de5b4025cbb3e1b60e7b7ff1ec51bc6736 Mon Sep 17 00:00:00 2001
From: Adeel Arshad <adeel_arshad@mentor.com>
Date: Fri, 7 Oct 2016 12:29:54 +0500
Subject: [PATCH] set the scons execution environment
propogate the external environment to scons execution environment.
Signed-off-by: Adeel Arshad <adeel_arshad@mentor.com>
---
CodeXL/Components/GpuProfiling/Build/SConstruct | 2 +-
CodeXL/Components/Graphics/SConstruct | 4 +++-
CodeXL/SConstruct | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CodeXL/Components/GpuProfiling/Build/SConstruct b/CodeXL/Components/GpuProfiling/Build/SConstruct
index 6d13e0d..90a36bb 100755
--- a/CodeXL/Components/GpuProfiling/Build/SConstruct
+++ b/CodeXL/Components/GpuProfiling/Build/SConstruct
@@ -33,7 +33,7 @@ initCXLVars(CXL_vars)
#
CXL_env = Environment(
variables = CXL_vars,
- ENV = {'PATH':os.environ['PATH']})
+ ENV = os.environ)
# CXL build initialization
initCXLBuild (CXL_env)
diff --git a/CodeXL/Components/Graphics/SConstruct b/CodeXL/Components/Graphics/SConstruct
index e46760d..92998aa 100644
--- a/CodeXL/Components/Graphics/SConstruct
+++ b/CodeXL/Components/Graphics/SConstruct
@@ -17,7 +17,9 @@ GPS_vars.Add('GPS_build', 'Set to release to build for release', 0)
GPS_vars.Add('GPS_arch', 'Set to x86 for 32 bit build', 0)
# Build the environment (base compiler options)
-GPS_env = Environment(variables = GPS_vars)
+GPS_env = Environment(
+ variables = GPS_vars,
+ ENV = os.environ)
Help(GPS_vars.GenerateHelpText(GPS_env))
# Set the version of PerfAPI that is being used
diff --git a/CodeXL/SConstruct b/CodeXL/SConstruct
index 1016ed3..a602f6a 100755
--- a/CodeXL/SConstruct
+++ b/CodeXL/SConstruct
@@ -32,7 +32,7 @@ initCXLVars(CXL_vars)
#
CXL_env = Environment(
variables = CXL_vars,
- ENV = {'PATH':os.environ['PATH']})
+ ENV = os.environ)
# CXL build initialization
initCXLBuild (CXL_env)
@@ -675,4 +675,4 @@ Alias( target='APICommon' ,source=(GPSAPICommon_Obj))
Alias( target='VulkanServer' ,source=(VulkanServer))
Alias( target='CapturePlayer' ,source=(CapturePlayer))
Alias( target='GPUPerfServer' ,source=(GPUPerfServer))
-Alias( target='VulkanEnv' , source=(VulkanEnv))
\ No newline at end of file
+Alias( target='VulkanEnv' , source=(VulkanEnv))
--
1.9.1
|