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

treewide: Fix some references to binutils

Browse Source 
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
   with a cross binutils.

 - Last two `binutils.binutils` which weren't reverted
This commit is contained in:
John Ericson 2017-09-14 18:12:54 -04:00
parent f5e0e94b2a
commit bf7b521500
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_REQUIRES_RTTI=1"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";

2
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.7/llvm.nix
View File

@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
++ stdenv.lib.optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
]
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
++ stdenv.lib.optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/mono/llvm.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
cmakeFlags = with stdenv; [
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";

2
pkgs/os-specific/darwin/binutils/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation {
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
done
for i in ${binutils-raw.dev or binutils-raw.out}/include/*.h; do
for i in ${stdenv.lib.getDev binutils-raw}/include/*.h; do
ln -s "$i" "$out/include/$(basename $i)"
done

4
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -177,9 +177,9 @@ rec {
# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils.binutils.out}/bin/$i $out/bin
cp ${binutils.out}/bin/$i $out/bin
done
cp -d ${binutils.binutils.lib}/lib/lib*.so* $out/lib
cp -d ${binutils.lib}/lib/lib*.so* $out/lib
chmod -R u+w $out