Lines 1-7
Link Here
|
1 |
--- SConstruct.orig 2019-08-08 20:06:23 UTC |
1 |
--- SConstruct.orig 2021-03-23 15:33:12 UTC |
2 |
+++ SConstruct |
2 |
+++ SConstruct |
3 |
@@ -1068,9 +1068,9 @@ if has_option('variables-help'): |
3 |
@@ -1261,9 +1261,9 @@ if has_option('variables-help'): |
4 |
print((env_vars.GenerateHelpText(env))) |
4 |
print(env_vars.GenerateHelpText(env)) |
5 |
Exit(0) |
5 |
Exit(0) |
6 |
|
6 |
|
7 |
-unknown_vars = env_vars.UnknownVariables() |
7 |
-unknown_vars = env_vars.UnknownVariables() |
Lines 11-19
Link Here
|
11 |
+#if unknown_vars: |
11 |
+#if unknown_vars: |
12 |
+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) |
12 |
+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) |
13 |
|
13 |
|
14 |
def set_config_header_define(env, varname, varval = 1): |
14 |
if get_option('install-action') != 'default' and get_option('ninja') != "disabled": |
15 |
env['CONFIG_HEADER_DEFINES'][varname] = varval |
15 |
env.FatalError("Cannot use non-default install actions when generating Ninja.") |
16 |
@@ -1851,7 +1851,7 @@ if env.TargetOSIs('posix'): |
16 |
@@ -2419,7 +2419,7 @@ if env.TargetOSIs('posix'): |
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 |
@@ -1865,7 +1865,7 @@ if env.TargetOSIs('posix'): |
25 |
@@ -2433,7 +2433,7 @@ if env.TargetOSIs('posix'): |
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 |