rarias/jungle
2
0
Fork 3
Code Issues 58 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
Conversation 1 Commits 1013 Files Changed 120 +3 -1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5789b4a77a - Show all commits

2
bsc/intel-compiler/wrapper2021.nix
View File

@@ -14,6 +14,8 @@ in wrapCCWith rec {
echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
echo "-isystem ${iccUnwrapped}/include" >> $out/nix-support/cc-cflags
echo "-isystem ${iccUnwrapped}/include/icc" >> $out/nix-support/cc-cflags
echo "-isystem ${gcc.cc}/include/c++/${gcc.version}" >> $out/nix-support/cc-cflags
echo "-isystem ${gcc.cc}/include/c++/${gcc.version}/${targetConfig}" >> $out/nix-support/cc-cflags
echo "-L${iccUnwrapped}/lib" >> $out/nix-support/cc-ldflags
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags

2
overlay.nix
View File

@@ -48,7 +48,7 @@ let
icc2021 = appendPasstru (callPackage ./bsc/intel-compiler/wrapper2021.nix {
iccUnwrapped = bsc.icc2021Unwrapped;
}) { CC = "icc"; CXX = "icpc"; };
}) { CC = "icx"; CXX = "icpx"; };
icc = bsc.icc2020;