Lines 1-6
Link Here
|
1 |
--- SConstruct.orig 2021-03-23 15:33:12 UTC |
1 |
--- SConstruct.orig 2021-04-29 23:06:52 UTC |
2 |
+++ SConstruct |
2 |
+++ SConstruct |
3 |
@@ -1261,9 +1261,9 @@ if has_option('variables-help'): |
3 |
@@ -1324,9 +1324,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 |
|
Lines 13-19
Link Here
|
13 |
|
13 |
|
14 |
if get_option('install-action') != 'default' and get_option('ninja') != "disabled": |
14 |
if get_option('install-action') != 'default' and get_option('ninja') != "disabled": |
15 |
env.FatalError("Cannot use non-default install actions when generating Ninja.") |
15 |
env.FatalError("Cannot use non-default install actions when generating Ninja.") |
16 |
@@ -2419,7 +2419,7 @@ if env.TargetOSIs('posix'): |
16 |
@@ -2498,7 +2498,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-37
Link Here
|
22 |
PROGLINKFLAGS=['-pie'], |
22 |
PROGLINKFLAGS=['-pie'], |
23 |
) |
23 |
) |
24 |
|
24 |
|
25 |
@@ -2433,7 +2433,7 @@ if env.TargetOSIs('posix'): |
25 |
@@ -2675,8 +2675,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs( |
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 |
@@ -2528,8 +2528,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs( |
35 |
# setting it for both C and C++ by setting both of CFLAGS and |
26 |
# setting it for both C and C++ by setting both of CFLAGS and |
36 |
# CXXFLAGS. |
27 |
# CXXFLAGS. |
37 |
|
28 |
|