commit 071f63e0

sago007 · 2015-12-25 15:08
071f63e0390545267f10e70f816f655eae2fe8df patch · browse files
parent 5320320068040ffe7ea7e2a79b5d7c2d3988cb1b

Ensure that scons do not try to use its own PATH and CXX. The build environment knows better.

Changed files

M	SConstruct before

diff --git a/SConstruct b/SConstruct index eebed40..28bd25d 100644 --- a/SConstruct +++ b/SConstruct

@@ -6,12 +6,15 @@ opts.Add('prefix', 'Destination directory', '/usr/local')

opts.Add('sharedir', 'Directory to use to store data file', '$prefix/share/blockattack')

opts.Add('bindir', 'Directory to use to store data file', '$prefix/bin')

opts.Add('mandir', 'Directory to use to store data file', '$prefix/share/man')

-opts.Add('CXX', 'C++ compiler to use', os.environ['CXX'])

opts.Add('CXXFLAGS', 'C++ flags', "-std=c++11")

# Copy Build Environment #

env = Environment(options = opts)

+if 'PATH' in os.environ:

+ env.Append(PATH = os.environ['PATH'])

+if 'CXX' in os.environ:

+ env.Append(CXX = os.environ['CXX'])

Export("env")

SConsignFile()