diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-28 21:58:56 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-28 21:58:56 -0400 |
| commit | 35165063a7d98bea767e8832105392baca63f950 (patch) | |
| tree | 91c05edc2c9af1de363b1e2ba5991509f0275952 | |
| parent | b574394d70830ef8407773633fb202f40cae9ba9 (diff) | |
| parent | 2780cf2838a84d551914c81f14471b04d3c1708f (diff) | |
| download | nixlib-35165063a7d98bea767e8832105392baca63f950.tar nixlib-35165063a7d98bea767e8832105392baca63f950.tar.gz nixlib-35165063a7d98bea767e8832105392baca63f950.tar.bz2 nixlib-35165063a7d98bea767e8832105392baca63f950.tar.lz nixlib-35165063a7d98bea767e8832105392baca63f950.tar.xz nixlib-35165063a7d98bea767e8832105392baca63f950.tar.zst nixlib-35165063a7d98bea767e8832105392baca63f950.zip | |
Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs
Fix -fsanitize=... options for clang
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/clang.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 6bb5622d0cf5..7032056f7e47 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -28,7 +28,11 @@ stdenv.mkDerivation { (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"); # Clang expects to find LLVMgold in its own prefix - postInstall = "ln -sv ${llvm}/lib/LLVMgold.so $out/lib"; + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/3.4/lib $out/lib/clang/3.4/ + ''; passthru.gcc = stdenv.gcc.gcc; |