Commit ea61be41 authored by Adam Joseph's avatar Adam Joseph Committed by Artturin
Browse files

gcc: set GFORTRAN_FOR_TARGET on cross-built native compilers 

For a cross-built native compiler, i.e. build!=(host==target), the
bundled libgfortran needs a gfortran which can run on the
buildPlatform and emit code for the targetPlatform.  The compiler
which is built alongside gfortran in this configuration doesn't meet
that need: it runs on the hostPlatform.

This commit passes the necessary compiler via `GFORTRAN_FOR_TARGET`,
using `pkgsBuildTarget.gfortran`.
parent f8056c50

pkgs/development/compilers/gcc/common/pre-configure.nix

+11 −0
Original line number Diff line number Diff line
@@ -3,12 +3,14 @@ 
, version, buildPlatform, hostPlatform, targetPlatform

, gnat-bootstrap ? null

, langAda ? false

, langFortran

, langJava ? false

, langJit ? false

, langGo

, withoutTargetLibc

, enableShared

, enableMultilib

, pkgsBuildTarget

}:



assert langJava -> lib.versionOlder version "7";
@@ -27,6 +29,15 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' 
  export PATH=${gnat-bootstrap}/bin:$PATH

''



# For a cross-built native compiler, i.e. build!=(host==target), the

# bundled libgfortran needs a gfortran which can run on the

# buildPlatform and emit code for the targetPlatform.  The compiler

# which is built alongside gfortran in this configuration doesn't

# meet that need: it runs on the hostPlatform.

+ lib.optionalString (langFortran && (with stdenv; buildPlatform != hostPlatform && hostPlatform == targetPlatform)) ''

  export GFORTRAN_FOR_TARGET=${pkgsBuildTarget.gfortran}/bin/${stdenv.targetPlatform.config}-gfortran

''



# On x86_64-darwin, the gnat-bootstrap bootstrap compiler that we need to build a

# native GCC with Ada support emits assembly that is accepted by the Clang

# integrated assembler, but not by the GNU assembler in cctools-port that Nix

pkgs/development/compilers/gcc/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
, gnused ? null

, cloog # unused; just for compat with gcc4, as we override the parameter on some places

, buildPackages

, pkgsBuildTarget

, libxcrypt

, disableGdbPlugin ? !enablePlugin

, nukeReferences
@@ -176,6 +177,7 @@ let inherit version; 
        nukeReferences

        patchelf

        perl

        pkgsBuildTarget

        profiledCompiler

        reproducibleBuild

        staticCompiler