Lines 1-6
Link Here
|
1 |
--- SConstruct.orig 2019-08-08 20:06:23 UTC |
1 |
--- SConstruct.orig 2021-06-30 17:39:08 UTC |
2 |
+++ SConstruct |
2 |
+++ SConstruct |
3 |
@@ -1068,9 +1068,9 @@ if has_option('variables-help'): |
3 |
@@ -1092,9 +1092,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 |
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 |
@@ -1851,7 +1851,7 @@ if env.TargetOSIs('posix'): |
16 |
@@ -1884,7 +1884,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 |
@@ -1898,7 +1898,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 |
Lines 31-33
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 |
@@ -3627,7 +3627,8 @@ def doConfigure(myenv): |
35 |
myenv = conf.Finish() |
36 |
|
37 |
if env['TARGET_ARCH'] == "aarch64": |
38 |
- AddToCCFLAGSIfSupported(myenv, "-moutline-atomics") |
39 |
+ # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html |
40 |
+ AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics") |
41 |
|
42 |
return myenv |
43 |
|