diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-10-16 19:42:37 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:29:23 +0000 |
| commit | f53d15bc9e95679c6cf5978d7caf0050514db124 (patch) | |
| tree | 8a2af611f2d9b60ee7b30bd85981bffa7007af77 /nixpkgs/pkgs/development/compilers | |
| parent | a8999ba7b2c4f7f267346490957702988f59af1f (diff) | |
| download | nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar.gz nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar.bz2 nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar.lz nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar.xz nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.tar.zst nixlib-f53d15bc9e95679c6cf5978d7caf0050514db124.zip | |
lldb_{10, 11}: polish the cmakeFlags (#100070)
disable RTTI in a more idiomatic way (cherry picked from commit 35f62abdf86b408daaa6512afea7ae51c13ac298)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix index 47215caa53e3..c728efeb2a9b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/lldb.nix @@ -43,21 +43,21 @@ stdenv.mkDerivation (rec { darwin.apple_sdk.frameworks.Cocoa ]; - CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ stdenv.lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" - ] -; + ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix index 865232a6ac2b..0ae55d45349a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix @@ -43,21 +43,21 @@ stdenv.mkDerivation (rec { darwin.apple_sdk.frameworks.Cocoa ]; - CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ stdenv.lib.optionals enableManpages [ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" - ] -; + ]; enableParallelBuilding = true; |