Lines 1-6
Link Here
|
1 |
--- SConstruct.orig 2018-01-04 23:28:55 UTC |
1 |
--- SConstruct.orig 2018-12-13 19:53:46.000000000 +0100 |
2 |
+++ SConstruct |
2 |
+++ SConstruct 2018-12-23 22:10:10.927789000 +0100 |
3 |
@@ -922,9 +922,9 @@ if has_option('variables-help'): |
3 |
@@ -1010,9 +1010,9 @@ |
4 |
print(env_vars.GenerateHelpText(env)) |
4 |
print(env_vars.GenerateHelpText(env)) |
5 |
Exit(0) |
5 |
Exit(0) |
6 |
|
6 |
|
Lines 13-19
Link Here
|
13 |
|
13 |
|
14 |
def set_config_header_define(env, varname, varval = 1): |
14 |
def set_config_header_define(env, varname, varval = 1): |
15 |
env['CONFIG_HEADER_DEFINES'][varname] = varval |
15 |
env['CONFIG_HEADER_DEFINES'][varname] = varval |
16 |
@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'): |
16 |
@@ -1770,7 +1770,7 @@ |
17 |
# If runtime hardening is requested, then build anything |
17 |
# If runtime hardening is requested, then build anything |
18 |
# destined for an executable with the necessary flags for PIE. |
18 |
# destined for an executable with the necessary flags for PIE. |
19 |
env.AppendUnique( |
19 |
env.AppendUnique( |
Lines 22-28
Link Here
|
22 |
PROGLINKFLAGS=['-pie'], |
22 |
PROGLINKFLAGS=['-pie'], |
23 |
) |
23 |
) |
24 |
|
24 |
|
25 |
@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'): |
25 |
@@ -1784,7 +1784,7 @@ |
26 |
"-Wno-unknown-pragmas", |
26 |
"-Wno-unknown-pragmas", |
27 |
"-Winvalid-pch"] ) |
27 |
"-Winvalid-pch"] ) |
28 |
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet |
28 |
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet |
Lines 31-46
Link Here
|
31 |
if not has_option("disable-warnings-as-errors"): |
31 |
if not has_option("disable-warnings-as-errors"): |
32 |
env.Append( CCFLAGS=["-Werror"] ) |
32 |
env.Append( CCFLAGS=["-Werror"] ) |
33 |
|
33 |
|
34 |
@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'): |
34 |
@@ -1820,12 +1820,12 @@ |
35 |
env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
35 |
env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
36 |
env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
36 |
env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) |
37 |
|
37 |
|
38 |
- if optBuild: |
38 |
- if optBuild and not optBuildForSize: |
39 |
- env.Append( CCFLAGS=["-O2"] ) |
39 |
- env.Append( CCFLAGS=["-O2"] ) |
|
|
40 |
- elif optBuild and optBuildForSize: |
41 |
- env.Append( CCFLAGS=["-Os"] ) |
40 |
- else: |
42 |
- else: |
41 |
- env.Append( CCFLAGS=["-O0"] ) |
43 |
- env.Append( CCFLAGS=["-O0"] ) |
42 |
+ #if optBuild: |
44 |
+ #if optBuild and not optBuildForSize: |
43 |
+ # env.Append( CCFLAGS=["-O2"] ) |
45 |
+ # env.Append( CCFLAGS=["-O2"] ) |
|
|
46 |
+ #elif optBuild and optBuildForSize: |
47 |
+ # env.Append( CCFLAGS=["-Os"] ) |
44 |
+ #else: |
48 |
+ #else: |
45 |
+ # env.Append( CCFLAGS=["-O0"] ) |
49 |
+ # env.Append( CCFLAGS=["-O0"] ) |
46 |
|
50 |
|