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
|
--- SConstruct.orig 2012-01-11 17:56:10 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']
@@ -858,13 +849,13 @@ if ((build != "i386-pc-mingw32") and
host_cpu == "i386" or
host_cpu == "x86_64")):
env.AppendUnique(CFLAGS = [
- '-Werror',
+ '-Werror -Wno-unused-function',
])
env.AppendUnique(CXXFLAGS = [
- '-Werror',
+ '-Werror -Wno-unused-function',
])
else:
- print "WARNING: Detected funky platform, will not enable -Werror compile option: ", host_cpu
+ print "WARNING: Detected funky platform, will not enable -Werror -Wno-unused-function compile option: ", host_cpu
# NOTE: gcc specific flags.
|
