wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Merge pull request #12097 from ConnorBaker/feat/meson-O3-LTO

Browse source 
packaging: use release builds and LTO by default
This commit is contained in:
John Ericson 2025-01-02 11:10:56 -05:00 • committed by GitHub
commit 442a2623e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 15 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix-meson-build-support/common/meson.build
View file

@ -16,7 +16,3 @@ add_project_arguments(
'-Wno-deprecated-declarations', '-Wno-deprecated-declarations',
language : 'cpp', language : 'cpp',
) )
if get_option('buildtype') not in ['debug']
add_project_arguments('-O3', language : 'cpp')
endif

15
packaging/dependencies.nix
View file

@ -66,6 +66,21 @@ let
mesonLayer = finalAttrs: prevAttrs: mesonLayer = finalAttrs: prevAttrs:
{ {
# NOTE:
# As of https://github.com/NixOS/nixpkgs/blob/8baf8241cea0c7b30e0b8ae73474cb3de83c1a30/pkgs/by-name/me/meson/setup-hook.sh#L26,
# `mesonBuildType` defaults to `plain` if not specified. We want our Nix-built binaries to be optimized by default.
# More on build types here: https://mesonbuild.com/Builtin-options.html#details-for-buildtype.
mesonBuildType = "release";
# NOTE:
# Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the
# guidance in https://github.com/NixOS/nix/blob/8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a/doc/manual/source/development/debugging.md?plain=1#L10.
# For this reason, we don't want to refer to `finalAttrs.mesonBuildType` here, but rather use the environment variable.
preConfigure = prevAttrs.preConfigure or "" + ''
case "$mesonBuildType" in
release|minsize) appendToVar mesonFlags "-Db_lto=true" ;;
*) appendToVar mesonFlags "-Db_lto=false" ;;
esac
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.buildPackages.meson pkgs.buildPackages.meson
pkgs.buildPackages.ninja pkgs.buildPackages.ninja

2
src/libcmd/meson.build
View file

@ -4,8 +4,6 @@ project('nix-cmd', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libexpr-c/meson.build
View file

@ -4,8 +4,6 @@ project('nix-expr-c', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libexpr-test-support/meson.build
View file

@ -4,8 +4,6 @@ project('nix-expr-test-support', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libexpr-tests/meson.build
View file

@ -4,8 +4,6 @@ project('nix-expr-tests', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libexpr/meson.build
View file

@ -4,8 +4,6 @@ project('nix-expr', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libfetchers-tests/meson.build
View file

@ -4,8 +4,6 @@ project('nix-fetchers-tests', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libfetchers/meson.build
View file

@ -4,8 +4,6 @@ project('nix-fetchers', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libflake-c/meson.build
View file

@ -4,8 +4,6 @@ project('nix-flake-c', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libflake-tests/meson.build
View file

@ -4,8 +4,6 @@ project('nix-flake-tests', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libflake/meson.build
View file

@ -4,8 +4,6 @@ project('nix-flake', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libmain-c/meson.build
View file

@ -4,8 +4,6 @@ project('nix-main-c', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libmain/meson.build
View file

@ -4,8 +4,6 @@ project('nix-main', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libstore-c/meson.build
View file

@ -4,8 +4,6 @@ project('nix-store-c', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libstore-test-support/meson.build
View file

@ -4,8 +4,6 @@ project('nix-store-test-support', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libstore-tests/meson.build
View file

@ -4,8 +4,6 @@ project('nix-store-tests', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libstore/meson.build
View file

@ -4,8 +4,6 @@ project('nix-store', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
'localstatedir=/nix/var', 'localstatedir=/nix/var',
], ],

2
src/libutil-c/meson.build
View file

@ -4,8 +4,6 @@ project('nix-util-c', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libutil-test-support/meson.build
View file

@ -4,8 +4,6 @@ project('nix-util-test-support', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libutil-tests/meson.build
View file

@ -4,8 +4,6 @@ project('nix-util-tests', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/libutil/meson.build
View file

@ -4,8 +4,6 @@ project('nix-util', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.1', meson_version : '>= 1.1',

2
src/nix/meson.build
View file

@ -4,8 +4,6 @@ project('nix', 'cpp',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
'localstatedir=/nix/var', 'localstatedir=/nix/var',
], ],

2
tests/functional/meson.build
View file

@ -4,8 +4,6 @@ project('nix-functional-tests',
'cpp_std=c++2a', 'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
], ],
meson_version : '>= 1.3', meson_version : '>= 1.3',