public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lldb_{10, 11}: polish the cmakeFlags (#100070) 

disable RTTI in a more idiomatic way
This commit is contained in:
Gabor Greif 2020-10-16 19:42:37 +02:00 committed by GitHub
parent 970e7e15f3
commit 35f62abdf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/llvm/10/lldb.nix
View File

@ -43,21 +43,21 @@ stdenv.mkDerivation (rec {
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
]; ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
cmakeFlags = [ cmakeFlags = [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic "-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DClang_DIR=${clang-unwrapped}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ stdenv.lib.optionals enableManpages [ ] ++ stdenv.lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON" "-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_OUTPUT_HTML=OFF"
] ];
;
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/development/compilers/llvm/11/lldb.nix
View File

@ -43,21 +43,21 @@ stdenv.mkDerivation (rec {
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
]; ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
cmakeFlags = [ cmakeFlags = [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic "-DLLVM_ENABLE_RTTI=OFF"
"-DClang_DIR=${clang-unwrapped}/lib/cmake" "-DClang_DIR=${clang-unwrapped}/lib/cmake"
"-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
] ++ stdenv.lib.optionals enableManpages [ ] ++ stdenv.lib.optionals enableManpages [
"-DLLVM_ENABLE_SPHINX=ON" "-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_OUTPUT_HTML=OFF"
] ];
;
enableParallelBuilding = true; enableParallelBuilding = true;