Merge pull request #231020 from amjoseph-nixpkgs/pr/fix/230626
This commit is contained in:
commit
8a3676e965
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue