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
79
|
--- SConstruct.orig 2018-07-11 16:37:51 UTC
+++ SConstruct
@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
# XXX TODO: Make initial CPPPATH/LIBPATH derive from
# autodetected host system *or* command line.
-#env = Environment(
-# TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
-# 'TOOL_SUBST'],
-# ENV = os.environ,
-# BUILDDIR = builddir,
-# CPPPATH=['/usr/local/include', '$BUILDDIR'],
-# LIBPATH=['usr/lib', '/usr/local/lib'],
-# variables = vars)
-
env = Environment(
TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
'TOOL_SUBST'],
ENV = os.environ,
BUILDDIR = builddir,
- CPPPATH=['$BUILDDIR'],
- LIBPATH=['usr/lib'],
+ CPPPATH=['/usr/local/include', '$BUILDDIR'],
+ LIBPATH=['usr/lib', '/usr/local/lib'],
variables = vars)
prefix = env['prefix']
@@ -853,20 +844,6 @@ if env['enable_boost']:
# Some platforms have alignment warnings that cannot easily be
# fixed, so we can't enable Werror for them.
-if ((build != "i386-pc-mingw32") and
- (host_cpu == "i686" or
- host_cpu == "i386" or
- host_cpu == "x86_64")):
- env.AppendUnique(CFLAGS = [
- '-Werror',
- ])
- env.AppendUnique(CXXFLAGS = [
- '-Werror',
- ])
-else:
- print "WARNING: Detected funky platform, will not enable -Werror compile option: ", host_cpu
-
-
# NOTE: gcc specific flags.
env.AppendUnique(CFLAGS = [
'-W',
@@ -874,12 +851,14 @@ env.AppendUnique(CFLAGS = [
'-Wwrite-strings',
'-Wbad-function-cast',
'-Wmissing-prototypes',
- '-Wcast-qual',
+ '-Wno-cast-qual',
+ '-Wno-sign-compare',
'-Wmissing-declarations',
'-Wpointer-arith',
- '-Wcast-align',
'-Wstrict-prototypes',
'-Wnested-externs',
+ '-Wno-unused-function',
+ '-Wno-unused-parameter',
'-pipe',
])
@@ -887,11 +866,10 @@ env.AppendUnique(CXXFLAGS = [
'-W',
'-Wall',
'-Wwrite-strings',
- '-Wcast-qual',
+ '-Wno-cast-qual',
+ '-Wno-sign-compare',
'-Wpointer-arith',
- '-Wcast-align',
'-Woverloaded-virtual',
- '-ftemplate-depth-25',
'-pipe',
])
|
