diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-12-09 21:41:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-09 21:41:54 +0000 |
commit | 926aaa48702a1a18c1179b72a8832f25842401ca (patch) | |
tree | c9e8c484da86ad15da5a8ab52ff3ad5ba46c2164 /pkgs/development/compilers | |
parent | 2309acf72337b49eef43d1dfc90d850d2682a4a5 (diff) | |
parent | 9d8f9b2e531bf95a700a949d879927fb6996ffc9 (diff) | |
download | nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar.gz nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar.bz2 nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar.lz nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar.xz nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.tar.zst nixlib-926aaa48702a1a18c1179b72a8832f25842401ca.zip |
Merge pull request #32215 from dtzWill/feature/clang-multilib
multilib-capable clang, multilib tests
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/llvm/multi.nix | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix new file mode 100644 index 000000000000..0fa0eb3404d8 --- /dev/null +++ b/pkgs/development/compilers/llvm/multi.nix @@ -0,0 +1,44 @@ +{ runCommand, +clang, +gcc64, +gcc32, +glibc_multi +}: + +let + combine = basegcc: runCommand "combine-gcc-libc" {} '' + mkdir -p $out + cp -r ${basegcc.cc}/lib $out/lib + + chmod u+rw -R $out/lib + cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*) + ''; + gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} '' + mkdir -p $out/lib/gcc + + ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/ + ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/ + # XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown" + ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu + + + # includes + ln -s ${glibc_multi.dev}/include $out/ + + # dynamic linkers + mkdir -p $out/lib/32 + ln -s ${glibc_multi.out}/lib/ld-linux* $out/lib + ln -s ${glibc_multi.out}/lib/32/ld-linux* $out/lib/32/ + ''; + + clangMulti = clang.override { + # Only used for providing expected structure re:dynamic linkers, AFAIK + # Most of the magic is done by setting the --gcc-toolchain option below + libc = gcc_multi_sysroot; + + extraBuildCommands = '' + sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags + ''; + }; + +in clangMulti |