diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-20 19:38:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 19:38:27 +0200 |
| commit | 5777ec590bb311a8ca3e2daf20d86e483cce7101 (patch) | |
| tree | 984abd6524e41605766e128620e80faeb7f7709f | |
| parent | 351197bfe406a226ff304712b97847bf51ce0abc (diff) | |
| parent | f035e7844fc809b2898a710f712fccfe4bd9faaf (diff) | |
Merge pull request #63257 from Riteo/ci-oom-fix
| -rw-r--r-- | .github/workflows/linux_builds.yml | 4 | ||||
| -rw-r--r-- | platform/linuxbsd/detect.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 0e27963b84..b88c84e34e 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -31,12 +31,12 @@ jobs: proj-conv: true artifact: true - - name: Editor with doubles and GCC sanitizers (target=debug, tools=yes, float=64, tests=yes, use_asan=no, use_ubsan=yes) + - name: Editor with doubles and GCC sanitizers (target=debug, tools=yes, float=64, tests=yes, use_asan=yes, use_ubsan=yes) cache-name: linux-editor-double-sanitizers target: debug tools: true tests: true - sconsflags: float=64 use_asan=no use_ubsan=yes + sconsflags: float=64 use_asan=yes use_ubsan=yes proj-test: true # Can be turned off for PRs that intentionally break compat with godot-cpp, # until both the upstream PR and the matching godot-cpp changes are merged. diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 19cf341c85..c5aff743e0 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -216,7 +216,6 @@ def configure(env): env["AR"] = "gcc-ar" env.Append(CCFLAGS=["-pipe"]) - env.Append(LINKFLAGS=["-pipe"]) ## Dependencies |