Line 0
Link Here
|
|
|
1 |
--- SConstruct.orig 2017-02-01 11:00:25.000000000 -0800 |
2 |
+++ SConstruct 2017-02-03 15:15:08.834295000 -0800 |
3 |
@@ -929,9 +929,9 @@ if has_option('variables-help'): |
4 |
print env_vars.GenerateHelpText(env) |
5 |
Exit(0) |
6 |
|
7 |
-unknown_vars = env_vars.UnknownVariables() |
8 |
-if unknown_vars: |
9 |
- env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) |
10 |
+#unknown_vars = env_vars.UnknownVariables() |
11 |
+#if unknown_vars: |
12 |
+# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) |
13 |
|
14 |
def set_config_header_define(env, varname, varval = 1): |
15 |
env['CONFIG_HEADER_DEFINES'][varname] = varval |
16 |
@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'): |
17 |
# If runtime hardening is requested, then build anything |
18 |
# destined for an executable with the necessary flags for PIE. |
19 |
env.AppendUnique( |
20 |
- PROGCCFLAGS=['-fPIE'], |
21 |
+ PROGCCFLAGS=['-fpic'], |
22 |
PROGLINKFLAGS=['-pie'], |
23 |
) |
24 |
|
25 |
@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'): |
26 |
"-Wno-unknown-pragmas", |
27 |
"-Winvalid-pch"] ) |
28 |
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet |
29 |
- if env.TargetOSIs('linux', 'osx', 'solaris'): |
30 |
+ if env.TargetOSIs('linux', 'osx', 'solaris', 'freebsd'): |
31 |
if not has_option("disable-warnings-as-errors"): |
32 |
env.Append( CCFLAGS=["-Werror"] ) |
33 |
|
34 |
@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'): |
35 |
env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
36 |
env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
37 |
|
38 |
- if optBuild: |
39 |
- env.Append( CCFLAGS=["-O2"] ) |
40 |
- else: |
41 |
- env.Append( CCFLAGS=["-O0"] ) |
42 |
+ #if optBuild: |
43 |
+ # env.Append( CCFLAGS=["-O2"] ) |
44 |
+ #else: |
45 |
+ # env.Append( CCFLAGS=["-O0"] ) |
46 |
|
47 |
# Promote linker warnings into errors. We can't yet do this on OS X because its linker considers |
48 |
# noall_load obsolete and warns about it. |
49 |
- if not env.TargetOSIs('osx'): |
50 |
- env.Append( |
51 |
- LINKFLAGS=[ |
52 |
- "-Wl,--fatal-warnings", |
53 |
- ], |
54 |
- ) |
55 |
+ #if not env.TargetOSIs('osx'): |
56 |
+ # env.Append( |
57 |
+ # LINKFLAGS=[ |
58 |
+ # "-Wl,--fatal-warnings", |
59 |
+ # ], |
60 |
+ # ) |
61 |
|
62 |
mmapv1 = False |
63 |
if get_option('mmapv1') == 'auto': |
64 |
@@ -2461,7 +2461,7 @@ def doConfigure(myenv): |
65 |
}} |
66 |
""".format(storage_class) |
67 |
context.Message('Checking for storage class {0} '.format(storage_class)) |
68 |
- ret = context.TryLink(textwrap.dedent(test_body), ".cpp") |
69 |
+ ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") |
70 |
context.Result(ret) |
71 |
return ret |
72 |
|