Begin moving bsc packages to root attribute

This commit is contained in:
2023-09-19 10:33:32 +02:00
parent fd766d8ff8
commit 51dcc6896e
8 changed files with 432 additions and 438 deletions

View File

@@ -1,10 +1,9 @@
{
stdenv
, gcc
, rt
, clangOmpss2Unwrapped
, wrapCCWith
, llvmPackages
, llvmPackages_latest
}:
@@ -13,16 +12,12 @@ let
# We need to replace the lld linker from bintools with our linker just built,
# otherwise we run into incompatibility issues when mixing compiler and linker
# versions.
bintools-unwrapped = llvmPackages.tools.bintools-unwrapped.override {
bintools-unwrapped = llvmPackages_latest.tools.bintools-unwrapped.override {
lld = clangOmpss2Unwrapped;
};
bintools = llvmPackages.tools.bintools.override {
bintools = llvmPackages_latest.tools.bintools.override {
bintools = bintools-unwrapped;
};
homevar = if rt.pname == "nanos6" then "NANOS6_HOME" else "NODES_HOME";
rtname = if rt.pname == "nanos6" then "libnanos6" else "libnodes";
targetConfig = stdenv.targetPlatform.config;
inherit gcc;
cc = clangOmpss2Unwrapped;
@@ -43,10 +38,6 @@ in wrapCCWith {
echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags
# Setup NANOS6_HOME or NODES_HOME, based on the runtime.
echo "export ${homevar}=${rt}" >> $out/nix-support/setup-hook
echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/setup-hook
wrap clang++ $wrapper $ccPath/clang++
'';
}