From 9e4aebdd7b6d704b7fceb098e284be98e38a5392 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 16 Jun 2018 10:13:38 -0400 Subject: [PATCH 1/2] ghc8.4: add android triple The triple is needed for armv7a-android-prebuilt to work (partly) with GHC. - also set EXTRA_CC_OPTS for ghc8.2 --- pkgs/development/compilers/ghc/8.2.2.nix | 2 ++ pkgs/development/compilers/ghc/8.4.3.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 4e9eff06f26..5f0818a017d 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -58,6 +58,8 @@ let '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index c57058a6352..a582bf0859d 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets ''; # TODO(@Ericson2314): Always pass "--target" and always prefix. From 6572cb595c568351d04632e9bc10748bbbb88396 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 19 Jun 2018 16:15:55 -0400 Subject: [PATCH 2/2] gmp: fix on android prebuilt --- pkgs/development/libraries/gmp/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cb2c3f15da8..f62883529fc 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, m4, cxx ? true -, buildPackages +{ stdenv, fetchurl, m4, cxx ? !hostPlatform.useAndroidPrebuilt +, buildPackages, hostPlatform , withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in