aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Overlays/Optimizations] Fix cmakeFlags

Browse source
This commit is contained in:
Antoine Viallon 2022-03-27 14:48:14 +02:00
parent f0ac8c8151
commit 8b6ba02f45
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
overlays.nix
View file

@ -14,16 +14,21 @@ let
cxxflags = [ (attrs.CXXFLAGS or "") ] ++ config.aviallon.programs.compileFlags; cxxflags = [ (attrs.CXXFLAGS or "") ] ++ config.aviallon.programs.compileFlags;
rustflags = [ (attrs.RUSTFLAGS or "") "-C target-cpu=${config.aviallon.general.cpuArch}" ]; rustflags = [ (attrs.RUSTFLAGS or "") "-C target-cpu=${config.aviallon.general.cpuArch}" ];
pkgname = getName pkg; pkgname = getName pkg;
cmakeflags = [ (attrs.cmakeFlags or "") ] ++ [ "-DCMAKE_CXX_FLAGS=\"${toString cxxflags}\"" ]; cmakeflags = mytrace "cmakeflags" "-DCMAKE_CXX_FLAGS=${toString cxxflags}";
configureflags = [ (attrs.configureFlags or "") ] ++ [
"--enable-lto" "--enable-offload-targets=nvptx-none" "--disable-libunwind-exceptions"
];
mytrace = name: value: builtins.trace "${pkgname}: ${name}: ${toString value}" (toString value); mytrace = name: value: builtins.trace "${pkgname}: ${name}: ${toString value}" (toString value);
in { in {
NIX_CFLAGS_COMPILE = mytrace "CFLAGS" cflags; NIX_CFLAGS_COMPILE = mytrace "CFLAGS" cflags;
CXXFLAGS = mytrace "CXXFLAGS" cxxflags; CXXFLAGS = mytrace "CXXFLAGS" cxxflags;
RUSTFLAGS = mytrace "RUSTFLAGS" rustflags; RUSTFLAGS = mytrace "RUSTFLAGS" rustflags;
configureFlags = mytrace "configureFlags" ([ (attrs.configureFlags or "") ] ++ [ configureFlags = mytrace "configureFlags" configureflags;
"--enable-lto" "--enable-offload-targets=nvptx-none" "--disable-libunwind-exceptions" preConfigure = ''
]); cmakeFlagsArray+=(
cmakeFlags = mytrace "cmakeFlags" cmakeflags; "${cmakeflags}"
)
'';
doCheck = false; doCheck = false;
}); });
optimizeForThisHost = if (cfg.optimizations) then (pkg: _optimizeForThisHost pkg) else (pkg: pkg); optimizeForThisHost = if (cfg.optimizations) then (pkg: _optimizeForThisHost pkg) else (pkg: pkg);