rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Compare commits

base: rarias:169ec60e7173651ef5489ac7936928d6eb65384f
Branches Tags
rarias:master
rarias:add-vivado
..
compare: rarias:93d9c770e87af8dab1bc065ad1cdc2f6366dbbba
Branches Tags
rarias:master
rarias:add-vivado

2 Commits
169ec60e71 ... 93d9c770e8

Author SHA1 Message Date
Aleix Roca Nonell
93d9c770e8 Fix C runtime objects path 
Some gcc versions append an extension to the patch version number, but
this exetension is not part of the installation path. This patch removes
the extension to the patch version.
 2025-05-26 10:29:16 +02:00
Aleix Roca Nonell
e84e961b9f openmpv: Remove dangling symlink 2025-05-26 10:28:30 +02:00
1 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

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

@ -9,14 +9,12 @@
, ompss2rt ? null
}:
with lib;
let
usingNodesAndOmpv = (openmp.pname == "openmp-v" && ompss2rt.pname == "nodes");
sameNosv = openmp.nosv == ompss2rt.nosv;
in
assert assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";
assert lib.assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";
let
homevar = if ompss2rt.pname == "nanos6" then "NANOS6_HOME" else "NODES_HOME";
@ -36,11 +34,11 @@ let
targetConfig = stdenv.targetPlatform.config;
inherit gcc;
cc = clangOmpss2Unwrapped;
gccVersion = with versions; let v = gcc.version; in concatStringsSep "." [(major v) (minor v) (patch v)];
gccVersion = lib.strings.concatStringsSep "." [(lib.versions.major gcc.version) (lib.versions.minor gcc.version) (lib.versions.patch gcc.version)];
in wrapCCWith {
inherit cc bintools;
# extraPackages adds packages to depsTargetTargetPropagated
extraPackages = optional (openmp != null) openmp;
extraPackages = lib.optional (openmp != null) openmp;
extraBuildCommands = ''
echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-cflags
@ -58,12 +56,12 @@ in wrapCCWith {
wrap clang++ $wrapper $ccPath/clang++
'' + optionalString (openmp != null) ''
'' + lib.optionalString (openmp != null) ''
echo "export OPENMP_RUNTIME=${ompname}" >> $out/nix-support/cc-wrapper-hook
'' + optionalString (ompss2rt != null) ''
'' + lib.optionalString (ompss2rt != null) ''
echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook
echo "export ${homevar}=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook
'' + optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
'' + lib.optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
echo "export NOSV_HOME=${ompss2rt.nosv}" >> $out/nix-support/cc-wrapper-hook
'';
}