diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-12 15:22:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-12 15:22:20 -0400 |
commit | 78a6156c5581f8fa0b8ad659880b13c9de35129f (patch) | |
tree | 8f52bce06866d79ff89018f69a3a9b79e933deaa /pkgs/development/compilers/llvm | |
parent | 4fb6ccbe615775e3b6aa8408bb976449437542a7 (diff) | |
parent | 555bbe0068e500edf4703fc26ee5ee412a60c0f2 (diff) | |
download | nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar.gz nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar.bz2 nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar.lz nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar.xz nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.tar.zst nixlib-78a6156c5581f8fa0b8ad659880b13c9de35129f.zip |
Merge pull request #61111 from matthewbauer/fix-lldb-7
lldb_7: fix broken build on darwin
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/7/lldb.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index a697aac5b8f2..f58871f1d7cd 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ cmake/modules/LLDBStandalone.cmake + sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \ + -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \ + tools/debugserver/source/CMakeLists.txt ''; nativeBuildInputs = [ cmake python which swig ]; @@ -36,8 +39,11 @@ stdenv.mkDerivation { CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; + cmakeFlags = [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DSKIP_DEBUGSERVER=ON" ]; enableParallelBuilding = true; |