pyrox.dev
Merge pull request #166977 from peperunas/clangMultiStdenv-fix
clangMultiStdenv: expose lib64 and lib separately in sysroot
authored by
John Ericson
and committed by
GitHub
f712cdd6
61a69abd
+2
-2
pkgs/development/compilers/llvm/multi.nix
+2
-2
pkgs/development/compilers/llvm/multi.nix
···
19
lib = gcc_multi_sysroot;
20
};
21
} ''
22
-
mkdir -p $out/lib/gcc
23
24
-
ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
25
ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/
26
# XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown"
27
ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu
···
19
lib = gcc_multi_sysroot;
20
};
21
} ''
22
+
mkdir -p $out/lib{,64}/gcc
23
24
+
ln -s ${combine gcc64}/lib/gcc/* $out/lib64/gcc/
25
ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/
26
# XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown"
27
ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu