diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 14:43:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 14:43:40 +0200 |
| commit | 54867a040055813462156809a33a260d8bf60642 (patch) | |
| tree | 4ecb6cae1c8027f263fe93532feda78ac1665ee6 /pkgs/development | |
| parent | 26e39566afe38488a4e3b4da045431f0ca4eaabe (diff) | |
| parent | c04e46c87d379f1d735c8b8c7135f67c442dbf62 (diff) | |
| download | nixlib-54867a040055813462156809a33a260d8bf60642.tar nixlib-54867a040055813462156809a33a260d8bf60642.tar.gz nixlib-54867a040055813462156809a33a260d8bf60642.tar.bz2 nixlib-54867a040055813462156809a33a260d8bf60642.tar.lz nixlib-54867a040055813462156809a33a260d8bf60642.tar.xz nixlib-54867a040055813462156809a33a260d8bf60642.tar.zst nixlib-54867a040055813462156809a33a260d8bf60642.zip | |
Merge pull request #19131 from aneeshusa/remove-redundant-cmake-build-type-release-args-part2
llvm3.9: Remove -DCMAKE_BUILD_TYPE=Release flags
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/clang/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/libc++/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/lldb.nix | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e75da0e9717e..6eadb91141d9 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 97cf65ad2090..3b7caaa24bf5 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index bb92a6eed6c0..0acef48f57b4 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" ]; |