From 80130d80a3b3f392720f55048e178bff6aa3d452 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 9 Jan 2022 22:52:42 +0000 Subject: [PATCH] Ensure LTO is not enabled Signed-off-by: falkTX --- .github/workflows/build.yml | 7 ++++--- wscript | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abab8912..72b4280e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,11 @@ on: branches: - '*' env: - CACHE_VERSION: 1 + CACHE_VERSION: 2 DEBIAN_FRONTEND: noninteractive HOMEBREW_NO_AUTO_UPDATE: 1 - PAWPAW_VERSION: f82379fcbf4623112ef497b118a96c1d94b7112e + PAWPAW_SKIP_LTO: 1 + PAWPAW_VERSION: 023bccdeffafc4212292072a1eba78d9e709510e jobs: # macOS native intel build @@ -122,7 +123,7 @@ jobs: if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ fi - - name: Fix GitHub mess + - name: Fix GitHub's mess run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq diff --git a/wscript b/wscript index 16af1695..be3bbb15 100644 --- a/wscript +++ b/wscript @@ -232,8 +232,12 @@ def configure(conf): mandatory=False) conf.env.append_unique('CFLAGS', '-Wall') - conf.env.append_unique('CXXFLAGS', ['-Wall', '-Wno-invalid-offsetof']) + conf.env.append_unique('CFLAGS', '-fno-lto') + conf.env.append_unique('CXXFLAGS', '-Wall') + conf.env.append_unique('CXXFLAGS', '-Wno-invalid-offsetof') + conf.env.append_unique('CXXFLAGS', '-fno-lto') conf.env.append_unique('CXXFLAGS', '-std=gnu++11') + conf.env.append_unique('LDFLAGS', '-fno-lto') if conf.env['IS_FREEBSD']: conf.check(lib='execinfo', uselib='EXECINFO', define_name='EXECINFO')