Line 0
Link Here
|
|
|
1 |
--- SConstruct.orig 2017-12-01 17:04:06 UTC |
2 |
+++ SConstruct |
3 |
@@ -922,9 +922,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 |
@@ -1612,7 +1612,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 |
@@ -1626,7 +1626,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', 'darwin', 'solaris'): |
30 |
+ if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'): |
31 |
if not has_option("disable-warnings-as-errors"): |
32 |
env.Append( CCFLAGS=["-Werror"] ) |
33 |
|
34 |
@@ -1661,10 +1661,10 @@ 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. |