forked from rarias/bscpkgs
Compare commits
8 Commits
cross-buil
...
fixes
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e5e572ddb | |||
| 439242f669 | |||
| 551b1b9e45 | |||
| 49ac6e6468 | |||
| 9db82cee49 | |||
| 109f4c8374 | |||
| ac559aa7d7 | |||
| f74a92ebd8 |
@@ -20,7 +20,8 @@
|
|||||||
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;
|
||||||
@@ -83,6 +84,8 @@ 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.nosv}" >> $out/nix-support/cc-wrapper-hook
|
echo "export NOSV_HOME=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook
|
||||||
'';
|
'';
|
||||||
}) // { inherit ompss2rt; }
|
}) // { inherit ompss2rt; }
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user