diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-10-16 19:42:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-16 19:42:37 +0200 |
| commit | 35f62abdf86b408daaa6512afea7ae51c13ac298 (patch) | |
| tree | b0ed0e2d60833aac8ce5f18b6e04997a79ed903f | |
| parent | 970e7e15f357daadda1e9aaa1f92241cc48713a5 (diff) | |
| download | nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar.gz nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar.bz2 nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar.lz nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar.xz nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.tar.zst nixpkgs-35f62abdf86b408daaa6512afea7ae51c13ac298.zip | |
lldb_{10, 11}: polish the cmakeFlags (#100070)
disable RTTI in a more idiomatic way
| -rw-r--r-- | pkgs/development/compilers/llvm/10/lldb.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/11/lldb.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 47215caa53e..c728efeb2a9 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/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/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 865232a6ac2..0ae55d45349 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/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; |