diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
| commit | 7257dedd7cf28634e08fc0458ed34a183065b70e (patch) | |
| tree | 53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/development/compilers/llvm | |
| parent | 7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff) | |
| parent | 563b491ce89bafaa928beba19a37f6381bfc60d0 (diff) | |
| download | nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2 nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/clang/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index a307978f59a..bc6767e8766 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -43,6 +43,9 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace tools/extra/clangd/CMakeLists.txt \ + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; outputs = [ "out" "lib" "python" ]; |