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

Merge pull request #47626 from obsidiansystems/ghc-cross-fixes

Browse Source 
ghc: Misc cross fixes
This commit is contained in:
John Ericson 2018-10-01 17:19:31 -04:00 committed by GitHub
commit a3d86b49b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -22,7 +22,7 @@
, # Whether to build dynamic libs for the standard library (on the target , # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? true enableShared ? !stdenv.targetPlatform.useiOSPrebuilt
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values. # specific flavour and falls back to ghc default values.
@ -79,7 +79,7 @@ let
targetCC = builtins.head toolsForTarget; targetCC = builtins.head toolsForTarget;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
version = "8.2.2"; version = "8.2.2";
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
@ -239,4 +239,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} } // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})

13
pkgs/development/compilers/ghc/head.nix
View File

@ -32,6 +32,8 @@
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
}: }:
assert !enableIntegerSimple -> gmp != null;
let let
inherit (stdenv) buildPlatform hostPlatform targetPlatform; inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -48,8 +50,7 @@ let
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
endif endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
'' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
INTEGER_LIBRARY = integer-simple
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
CrossCompilePrefix = ${targetPrefix} CrossCompilePrefix = ${targetPrefix}
@ -77,7 +78,7 @@ let
targetCC = builtins.head toolsForTarget; targetCC = builtins.head toolsForTarget;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
inherit version; inherit version;
inherit (src) rev; inherit (src) rev;
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
@ -206,4 +207,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} } // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})