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

Merge pull request #19131 from aneeshusa/remove-redundant-cmake-build-type-release-args-part2 

llvm3.9: Remove -DCMAKE_BUILD_TYPE=Release flags
This commit is contained in:
Jörg Thalheim 2016-10-03 14:43:40 +02:00 committed by GitHub
parent 26e39566af c04e46c87d
commit 54867a0400
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/llvm/3.9/clang/default.nix
View File

@ -16,7 +16,6 @@ let
buildInputs = [ cmake libedit libxml2 llvm python ]; buildInputs = [ cmake libedit libxml2 llvm python ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ ] ++
# Maybe with compiler-rt this won't be needed? # Maybe with compiler-rt this won't be needed?

3
pkgs/development/compilers/llvm/3.9/libc++/default.nix
View File

@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=Release"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_CXX_ABI=libcxxabi" "-DLIBCXX_CXX_ABI=libcxxabi"

1
pkgs/development/compilers/llvm/3.9/lldb.nix
View File

@ -41,7 +41,6 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include"
]; ];