at v206 44 lines 1.1 kB view raw
1Get the environment propagated to scons forked childs, and correct the dicom plugin about 2a typedef of size_t that failed at least on x86_64-linux. 3 4diff --git a/SConstruct b/SConstruct 5index 16eccd9..603e931 100644 6--- a/SConstruct 7+++ b/SConstruct 8@@ -7,8 +7,7 @@ else: 9 cppflags = ['-O2'] 10 variant = 'Release' 11 12-env = Environment(LIBPATH=[], 13- CPPFLAGS = cppflags) 14+env = Environment(ENV = os.environ) 15 16 env['SBOX'] = False 17 18diff --git a/giv/SConstruct b/giv/SConstruct 19index 047839a..2c267aa 100644 20--- a/giv/SConstruct 21+++ b/giv/SConstruct 22@@ -3,8 +3,9 @@ 23 24 import sys 25 import re 26+import os 27 28-env = Environment() 29+env = Environment(ENV = os.environ) 30 31 src = ["giv.c", 32 "giv-backstore.c", 33diff --git a/src/plugins/dcmtk/SConstruct.standalone b/src/plugins/dcmtk/SConstruct.standalone 34index ffce001..74246f8 100644 35--- a/src/plugins/dcmtk/SConstruct.standalone 36+++ b/src/plugins/dcmtk/SConstruct.standalone 37@@ -1,4 +1,6 @@ 38-env = Environment() 39+import os 40+ 41+env = Environment(ENV = os.environ) 42 43 variant = "Debug" 44