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

Compare commits

base: arocanon:551b1b9e45217dc1fd6b38e7e194372992fd1b31
Branches Tags
arocanon:master arocanon:cross-build-fixes arocanon:fixes arocanon:add-vivado rarias:master rarias:add-vivado
...
compare: arocanon:6e5e572ddb01b018a4b9c4c678d4361bc82f2e1e
Branches Tags
arocanon:cross-build-fixes arocanon:fixes arocanon:master arocanon:add-vivado rarias:master rarias:add-vivado

2 Commits
551b1b9e45 ... 6e5e572ddb

Author SHA1 Message Date
Aleix Roca Nonell
6e5e572ddb targetTarget might be missing when native build 2025-09-10 08:43:50 +02:00
Aleix Roca Nonell
439242f669 tmp 2025-09-09 16:47:23 +02:00
1 changed files with 14 additions and 7 deletions
Expand all files Collapse all files

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

@@ -20,13 +20,19 @@
with lib;
let
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";
omp = if useOpenmp then openmp else if useOpenmpV then openmpv else null;
ompss2rt = if useNanos6 then nanos6 else if useNodes then nodes else null;
ompss2rtUnspliced = if useNanos6 then nanos6 else if useNodes then nodes else null;
ompss2rt = getSpliceTargetTarget ompss2rtUnspliced;
usingNodesAndOmpv = (omp.pname == "openmp-v" && ompss2rt.pname == "nodes");
sameNosv = omp.nosv == ompss2rt.nosv;
sameNosvUnspliced = omp.nosv == ompss2rtUnspliced.nosv;
sameNosvSpliced = (getSpliceTargetTarget omp.nosv) == ompss2rt.nosv;
in
assert assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";
assert assertMsg (usingNodesAndOmpv -> sameNosvUnspliced) "OpenMP-V and NODES must share the same nOS-V before splice";
assert assertMsg (usingNodesAndOmpv -> sameNosvSpliced) "OpenMP-V and NODES must share the same nOS-V after splice";
assert assertMsg (useOpenmp -> !useOpenmpV) "Either OpenMP or OpenMP-V may be enabled, but not both";
assert assertMsg (useNanos6 -> !useNodes) "Either Nanos6 or NODES may be enabled, but not both";
@@ -49,7 +55,7 @@ let
inherit gcc;
cc = clangOmpss2Unwrapped;
gccVersion = with versions; let v = gcc.version; in concatStringsSep "." [(major v) (minor v) (patch v)];
in wrapCCWith {
in (wrapCCWith {
inherit cc bintools;
# extraPackages adds packages to depsTargetTargetPropagated
extraPackages = optional (omp != null) omp;
@@ -76,9 +82,10 @@ in wrapCCWith {
echo "export OPENMP_RUNTIME=${ompname}" >> $out/nix-support/cc-wrapper-hook
'' + optionalString (ompss2rt != null) ''
echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook
echo "export ${homevar}=${ompss2rt.__spliced.targetTarget}" >> $out/nix-support/cc-wrapper-hook
echo "export ${homevar}=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook
'' + optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
echo "export NOSV_HOME=${ompss2rt.nosv.__spliced.targetTarget}" >> $out/nix-support/cc-wrapper-hook
echo "export NOSV_HOME=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook
'';
}
}) // { inherit ompss2rt; }