arocanon/bscpkgs
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests Activity

Compare commits

base: arocanon:fixes
Branches Tags
arocanon:master arocanon:cross-build-fixes arocanon:fixes arocanon:add-vivado rarias:master rarias:add-vivado
..
compare: arocanon:cross-build-fixes
Branches Tags
arocanon:cross-build-fixes arocanon:fixes arocanon:master arocanon:add-vivado rarias:master rarias:add-vivado

5 Commits
fixes ... cross-buil

Author SHA1 Message Date
Aleix Roca Nonell
fef302e857 Use explicit splicing in clang wrapper 2026-01-12 11:55:22 +01:00
Aleix Roca Nonell
52549cc1f0 Do not force derviation inputs, use booleans instead 2026-01-12 11:55:22 +01:00
Aleix Roca Nonell
290071e6dc TEMPORAL CLANG LINKER FIX FOR CROSS 2026-01-12 11:55:22 +01:00
Aleix Roca Nonell
e0e9a4a77b Fix clang cross-build 2026-01-12 11:55:22 +01:00
Aleix Roca Nonell
d9a49df8ff Fix missing tampi native build inputs 2026-01-12 11:55:22 +01:00
1 changed files with 2 additions and 5 deletions
Expand all files Collapse all files

7
pkgs/llvm-ompss2/default.nix
View File

@@ -20,8 +20,7 @@
with lib; with lib;
let let
getSplice = target: pkg: if pkg ? "__spliced" && pkg.__spliced ? target then pkg.__spliced."${target}" else pkg; getSplice = target: pkg: if pkg ? "__spliced" && pkg.__spliced ? "${target}" then pkg.__spliced."${target}" else pkg;
#getSpliceTargetTarget = pkg: if pkg ? "__spliced" && pkg.__spliced ? "targetTarget" then pkg.__spliced.targetTarget else pkg;
getSpliceTargetTarget = getSplice "targetTarget"; getSpliceTargetTarget = getSplice "targetTarget";
omp = if useOpenmp then openmp else if useOpenmpV then openmpv else null; omp = if useOpenmp then openmp else if useOpenmpV then openmpv else null;
ompss2rtUnspliced = if useNanos6 then nanos6 else if useNodes then nodes else null; ompss2rtUnspliced = if useNanos6 then nanos6 else if useNodes then nodes else null;
@@ -84,8 +83,6 @@ in (wrapCCWith {
echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook
echo "export ${homevar}=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook echo "export ${homevar}=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook
'' + optionalString (ompss2rt != null && ompss2rt.pname == "nodes") '' '' + optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
echo "export NOSV_HOME=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook echo "export NOSV_HOME=${ompss2rt.nosv}" >> $out/nix-support/cc-wrapper-hook
''; '';
}) // { inherit ompss2rt; } }) // { inherit ompss2rt; }