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
66
67
68
69
70
71
72
73
74
75
76
77
78
|
diff -ur adchpp_2.9.0_source.orig/SConstruct adchpp_2.9.0_source/SConstruct
--- adchpp_2.9.0_source.orig/SConstruct 2013-02-07 21:31:11.952964272 +0100
+++ adchpp_2.9.0_source/SConstruct 2013-02-07 21:33:06.574966920 +0100
@@ -6,9 +6,9 @@
from build_util import Dev
gcc_flags = {
- 'common': ['-g', '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-unused-value', '-Wno-missing-field-initializers', '-Wno-address', '-Wno-unknown-pragmas', '-fexceptions'],
+ 'common': ['-fexceptions'],
'debug': [],
- 'release' : ['-O3', '-fno-ipa-cp-clone']
+ 'release' : []
}
gcc_xxflags = {
@@ -45,7 +45,7 @@
}
gcc_link_flags = {
- 'common' : ['-g', '$UNDEF', '-time'],
+ 'common' : ['$UNDEF', '-time'],
'debug' : [],
'release' : ['-O3']
}
@@ -77,6 +77,22 @@
langs = ['lua', 'python', 'ruby']
defEnv = Environment(ENV = os.environ)
+
+if 'CC' in os.environ:
+ defEnv.Replace(CC = os.environ['CC'])
+
+if 'CXX' in os.environ:
+ defEnv.Replace(CXX = os.environ['CXX'])
+
+if 'CCFLAGS' in os.environ:
+ defEnv.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
+
+if 'CXXFLAGS' in os.environ:
+ defEnv.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
+
+if 'LINKFLAGS' in os.environ:
+ defEnv.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
+
opts = Variables('custom.py', ARGUMENTS)
if sys.platform == 'win32':
@@ -111,6 +127,21 @@
env = Environment(ENV = os.environ, tools = [defEnv['tools'], 'swig'], toolpath = ['tools'], options = opts, TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH)
+if 'CC' in os.environ:
+ env.Replace(CC = os.environ['CC'])
+
+if 'CXX' in os.environ:
+ env.Replace(CXX = os.environ['CXX'])
+
+if 'CCFLAGS' in os.environ:
+ env.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
+
+if 'CXXFLAGS' in os.environ:
+ env.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
+
+if 'LINKFLAGS' in os.environ:
+ env.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
+
# filter out boost from dependencies to get a speedier rebuild scan
# this means that if boost changes, scons -c needs to be run
# delete .sconsign.dblite to see the effects of this if you're upgrading
@@ -143,8 +174,6 @@
if env['savetemps']:
env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])
- else:
- env.Append(CCFLAGS = ['-pipe'])
# require i686 instructions for atomic<int64_t>, used by boost::lockfree (otherwise lockfree
# lists won't actually be lock-free).
|