Commit 9cda2f55 authored by John Ericson's avatar John Ericson
Browse files

gcc: Fix deps, for cross and consistency 

Mainly making sure we have tools to build target libs
parent 114a9b62

pkgs/development/compilers/gcc/4.5/default.nix

+12 −2
Original line number Diff line number Diff line
@@ -233,8 +233,18 @@ stdenv.mkDerivation ({ 
  nativeBuildInputs = [ texinfo which gettext ]

    ++ optional (perl != null) perl;



  buildInputs = [ gmp mpfr libmpc libelf ]

    ++ (optional (ppl != null) ppl)

  # For building runtime libs

  depsBuildTarget =

    if hostPlatform == buildPlatform then [

      targetPackages.stdenv.cc.bintools # newly-built gcc will be used

    ] else assert targetPlatform == hostPlatform; [ # build != host == target

      stdenv.cc

    ];



  buildInputs = [

    gmp mpfr libmpc libelf

    targetPackages.stdenv.cc.bintools # For linking code at run-time

  ] ++ (optional (ppl != null) ppl)

    ++ (optional (cloogppl != null) cloogppl)

    ++ (optional (zlib != null) zlib)

    ++ (optional langJava boehmgc)

pkgs/development/compilers/gcc/4.9/default.nix

+12 −2
Original line number Diff line number Diff line
@@ -267,8 +267,18 @@ stdenv.mkDerivation ({ 
    ++ (optional (perl != null) perl)

    ++ (optional javaAwtGtk pkgconfig);



  buildInputs = [ gmp mpfr libmpc libelf ]

    ++ (optional (cloog != null) cloog)

  # For building runtime libs

  depsBuildTarget =

    if hostPlatform == buildPlatform then [

      targetPackages.stdenv.cc.bintools # newly-built gcc will be used

    ] else assert targetPlatform == hostPlatform; [ # build != host == target

      stdenv.cc

    ];



  buildInputs = [

    gmp mpfr libmpc libelf

    targetPackages.stdenv.cc.bintools # For linking code at run-time

  ] ++ (optional (cloog != null) cloog)

    ++ (optional (isl != null) isl)

    ++ (optional (zlib != null) zlib)

    ++ (optionals langJava [ boehmgc zip unzip ])

pkgs/development/compilers/gcc/5/default.nix

+12 −5
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ assert libelf != null -> zlib != null; 
# Make sure we get GNU sed.

assert hostPlatform.isDarwin -> gnused != null;



# Need c++filt on darwin

assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;



# The go frontend is written in c++

assert langGo -> langCC;
@@ -282,8 +279,18 @@ stdenv.mkDerivation ({ 
    ++ (optional (perl != null) perl)

    ++ (optional javaAwtGtk pkgconfig);



  buildInputs = [ gmp mpfr libmpc libelf ]

    ++ (optional (isl != null) isl)

  # For building runtime libs

  depsBuildTarget =

    if hostPlatform == buildPlatform then [

      targetPackages.stdenv.cc.bintools # newly-built gcc will be used

    ] else assert targetPlatform == hostPlatform; [ # build != host == target

      stdenv.cc

    ];



  buildInputs = [

    gmp mpfr libmpc libelf

    targetPackages.stdenv.cc.bintools # For linking code at run-time

  ] ++ (optional (isl != null) isl)

    ++ (optional (zlib != null) zlib)

    ++ (optionals langJava [ boehmgc zip unzip ])

    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

pkgs/development/compilers/gcc/6/default.nix

+12 −5
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ assert libelf != null -> zlib != null; 
# Make sure we get GNU sed.

assert hostPlatform.isDarwin -> gnused != null;



# Need c++filt on darwin

assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;



# The go frontend is written in c++

assert langGo -> langCC;
@@ -281,8 +278,18 @@ stdenv.mkDerivation ({ 
    ++ (optional (perl != null) perl)

    ++ (optional javaAwtGtk pkgconfig);



  buildInputs = [ gmp mpfr libmpc libelf ]

    ++ (optional (isl != null) isl)

  # For building runtime libs

  depsBuildTarget =

    if hostPlatform == buildPlatform then [

      targetPackages.stdenv.cc.bintools # newly-built gcc will be used

    ] else assert targetPlatform == hostPlatform; [ # build != host == target

      stdenv.cc

    ];



  buildInputs = [

    gmp mpfr libmpc libelf

    targetPackages.stdenv.cc.bintools # For linking code at run-time

  ] ++ (optional (isl != null) isl)

    ++ (optional (zlib != null) zlib)

    ++ (optionals langJava [ boehmgc zip unzip ])

    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

pkgs/development/compilers/gcc/7/default.nix

+12 −5
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ assert libelf != null -> zlib != null; 
# Make sure we get GNU sed.

assert hostPlatform.isDarwin -> gnused != null;



# Need c++filt on darwin

assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;



# The go frontend is written in c++

assert langGo -> langCC;
@@ -278,8 +275,18 @@ stdenv.mkDerivation ({ 
    ++ (optional (perl != null) perl)

    ++ (optional javaAwtGtk pkgconfig);



  buildInputs = [ gmp mpfr libmpc libelf flex ]

    ++ (optional (isl != null) isl)

  # For building runtime libs

  depsBuildTarget =

    if hostPlatform == buildPlatform then [

      targetPackages.stdenv.cc.bintools # newly-built gcc will be used

    ] else assert targetPlatform == hostPlatform; [ # build != host == target

      stdenv.cc

    ];



  buildInputs = [

    gmp mpfr libmpc libelf flex

    targetPackages.stdenv.cc.bintools # For linking code at run-time

  ] ++ (optional (isl != null) isl)

    ++ (optional (zlib != null) zlib)

    ++ (optionals langJava [ boehmgc zip unzip ])

    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))