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

remove ompss wrapper flags

Browse Source
This commit is contained in:
Aleix Boné
2025-06-21 16:55:01 +02:00
parent 3a1b58ec9d
commit 3e12fa5190
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/intel-oneapi/patch_intel.nix
View File

@@ -161,8 +161,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sed -i 's/.*isCxx=0/isCxx=1/' $out/bin/icpx
ln -s ${finalAttrs.finalPackage.pkgs.compiler}/lib $out/lib
ln -s ${finalAttrs.finalPackage.pkgs.compiler}/include $out/include
# ln -s ${finalAttrs.finalPackage.pkgs.compiler}/lib $out/lib
# ln -s ${finalAttrs.finalPackage.pkgs.compiler}/include $out/include
'';
extraInstall = ''
export named_cc="icx"

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

@@ -69,24 +69,31 @@ in wrapCCWith {
# extraPackages adds packages to depsTargetTargetPropagated
extraPackages = 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
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
# echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
# echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-cflags
# echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
# echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
for dir in ${gcc.cc}/lib/gcc/${targetConfig}/*/include; do
echo "-isystem $dir" >> $out/nix-support/cc-cflags
done
for dir in ${gcc.cc}/include/c++/*; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done
for dir in ${gcc.cc}/include/c++/*/${targetConfig}; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done
echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags
# echo -isystem /nix/store/4mm9nmvyfcyry1pnry29l415yk7321w6-intel-hpckit-2025.1.2-6/compiler/2025.1/lib/clang/20/include >> $out/nix-support/cc-cflags
# # echo -isystem /nix/store/2l456zvnb20aqinwni28l1l8kxfsm32v-intel-compiler-2025.1/include >> $out/nix-support/cc-cflags
# # echo -isystem /nix/store/2l456zvnb20aqinwni28l1l8kxfsm32v-intel-compiler-2025.1/include/intel64 >> $out/nix-support/cc-cflags
# echo -isystem /nix/store/62qjb50708fdhb4f2y7zxyqr1afir4fk-gcc-13.3.0/include/c++/13.3.0 >> $out/nix-support/cc-cflags
# echo -isystem /nix/store/62qjb50708fdhb4f2y7zxyqr1afir4fk-gcc-13.3.0/include/c++/13.3.0/x86_64-unknown-linux-gnu >> $out/nix-support/cc-cflags
wrap clang++ $wrapper $ccPath/clang++
# for dir in ${gcc.cc}/lib/gcc/${targetConfig}/*/include; do
# echo "-isystem $dir" >> $out/nix-support/cc-cflags
# done
# for dir in ${gcc.cc}/include/c++/*; do
# echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
# done
# for dir in ${gcc.cc}/include/c++/*/${targetConfig}; do
# echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
# done
#
# echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags
#
# wrap clang++ $wrapper $ccPath/clang++
sed -i 's|# Flirting.*|&\nsource ${resetIntelCCFlags}|' $out/bin/clang
sed -i 's|# Flirting.*|&\nsource ${resetIntelCCFlags}|' $out/bin/clang++