diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
| commit | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (patch) | |
| tree | 23fe6fb06258812145de6c5c2c41bf83b887af72 /pkgs/development/compilers/llvm/7/lldb.nix | |
| parent | ef0dbef7f15f962f9fedfd86563664bc95e6e2f9 (diff) | |
| parent | f2affe03443d916d1c693dc246e48985bc2222d4 (diff) | |
| download | nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.gz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.bz2 nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.lz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.xz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.zst nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/7/lldb.nix')
| -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 a697aac5b8f..f58871f1d7c 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; |