public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang_6: fix sanitizers under libstdc++

Browse Source
This commit is contained in:
Benjamin Saunders
2018-05-24 14:43:31 -07:00
parent 11d26c797f
commit b0d0b1adfe
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/llvm/6/default.nix
View File

@@ -38,10 +38,16 @@ let
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
extraPackages = [ libstdcxxHook targetLlvmLibraries.compiler-rt ];
extraBuildCommands = ''
rsrc="$out/resource-root"
mkdir "$rsrc"
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
'';
};
@@ -53,7 +59,6 @@ let
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
isCompilerRT = true;
extraBuildCommands = ''
rsrc="$out/resource-root"
mkdir "$rsrc"