diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:44:01 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:26 +0200 |
| commit | 9f8a22fae551681ba490b92caaad76bfc89ec24e (patch) | |
| tree | 688d33a39481f4ef1a4bea59e8cf1ec255fee6e2 | |
| parent | 85a51074dc5cde05fc8359c54e7f425953ef7880 (diff) | |
| download | nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar.gz nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar.bz2 nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar.lz nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar.xz nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.tar.zst nixpkgs-9f8a22fae551681ba490b92caaad76bfc89ec24e.zip | |
treewide: Make explicit that 'dev' output of binutils is used
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.5/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.6/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.7/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/mono/llvm.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 59e8055efb2..adf65f7c939 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index f16b6981dea..64df30dc23f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 2ccf9d1ed71..5941d788356 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index be527d87375..3a7829eca6d 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index db73999719d..93f5a9f6367 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 74f85b1519c..de9339bb8a2 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; |