Fix android prebuilt ghc [Fixes #40194] #40210

ElvishJerricco · 2018-05-09T08:28:43Z

Motivation for this change

In order to build GHC to cross compile to android, we need an extra c flag, and we need a patch from master to fix hsc2hs. There is also an issue with forbidden references in dynamic exes, so for now we just don't enableShared:

RPATH of binary /nix/store/bbg892bbs7dqjqm9y1jpgwc2s5sw1xxb-aarch64-unknown-linux-android-ghc-8.4.2/lib/aarch64-unknown-linux-android-ghc-8.4.2/bin/ghc-iserv-dyn contains a forbidden reference to /tmp/nix-build-aarch64-unknown-linux-android-ghc-8.4.2.drv

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

Should this be in cc-wrapper?

ElvishJerricco · 2018-05-09T08:30:45Z

Hm. There's a lingering issue with libiconv when trying to build the hello haskell package.

@nix { "action": "setPhase", "phase": "setupCompilerEnvironmentPhase" }
setupCompilerEnvironmentPhase
Build with /nix/store/xnyaam87fjk1nqfpj7fgyyzji5q2flh1-aarch64-unknown-linux-android-ghc-8.4.2.
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/x3p4dk6kpx485f94d09hiqiy6cvz7i93-hello-1.0.0.2.tar.gz
source root is hello-1.0.0.2
setting SOURCE_DATE_EPOCH to timestamp 1278083122 of file hello-1.0.0.2/src/hello.hs
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
@nix { "action": "setPhase", "phase": "compileBuildDriverPhase" }
compileBuildDriverPhase
setupCompileFlags: -package-db=/tmp/nix-build-hello-1.0.0.2-aarch64-unknown-linux-android.drv-0/package.conf.d -j4 -threaded
[1 of 1] Compiling Main             ( Setup.hs, /tmp/nix-build-hello-1.0.0.2-aarch64-unknown-linux-android.drv-0/Main.o )
Linking Setup ...
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: cannot find -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: cannot find -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: cannot find -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.so when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: skipping incompatible /nix/store/fh010pwx46whw9dwzxsawkwygwrgri5k-libiconv-1.15-aarch64-unknown-linux-android/lib/libiconv.a when searching for -liconv
/nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/ld: cannot find -liconv
collect2: error: ld returned 1 exit status
`cc' failed in phase `Linker'. (Exit code: 1)

But I think we can call this a separate issue.

ElvishJerricco · 2018-05-09T08:31:57Z

/cc @Ericson2314 @angerman

ElvishJerricco · 2018-05-09T10:30:28Z

pkgs/development/compilers/ghc/8.4.2.nix

@@ -79,6 +81,8 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "doc" ];

+  patches = [./8.4.2-hsc2hs-cross-build.patch];


@Ericson2314 Should this be unconditional like this? It's harmless on the normal build, but will require a rebuild of GHC 8.4.2.

Yeah I agree. Simple is better.

Ericson2314

Great work @ElvishJerricco! Thanks so much!!

Ericson2314 · 2018-05-09T17:06:09Z

pkgs/development/compilers/ghc/head.nix

@@ -22,7 +22,7 @@

 , # Whether to build dynamic libs for the standard library (on the target
  # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt


Can you apply the head.nix changes on more other GHCs for consistency?

It's already applied to 8.4. No other GHC versions will be able to build for Android. It'd be better to have a "Not android" assertion in all the other GHCs. Want me to add this?

Ah and there are fewer GHCs now too, +1.

Ericson2314 · 2018-05-09T17:09:04Z

pkgs/development/compilers/ghc/8.4.2.nix

@@ -79,6 +81,8 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "doc" ];

+  patches = [./8.4.2-hsc2hs-cross-build.patch];


Yeah I agree. Simple is better.

Ericson2314 · 2018-05-09T17:12:13Z

pkgs/development/compilers/ghc/8.4.2-hsc2hs-cross-build.patch

@@ -0,0 +1,41 @@
+Submodule utils/hsc2hs 9483ad1006..738f3666c8:


This is a great patch! Can you open a phabricator review of it? Then we can fetchPatch it.

If it's already an 8.4 branch (or even master) commit we can pull the diff from cgit at haskell.org too. (You can give me hash and I'll do it if you like.)

It's on master but not 8.4. It's an update to a submodule, which complicates things. I tried doing fetchPatch on https://git.haskell.org/ghc.git/commitdiff_plain/..., but the change to the submodule is just shown as -rev\n+rev. Had to do git diff --submodule=diff, and I don't know of any end point that would have such a diff.

https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff there is a fetchPath argument to prefix all paths in the patch so that it works.

Fixed, thanks

matthewbauer · 2018-06-22T18:56:28Z

Hey, just for reference, did you ever get "armv7a-android-prebuilt" to build after these changes? I am trying to figure out the cause of #42333 & not sure if it 8.4.* was ever working.

ElvishJerricco · 2018-06-22T19:17:37Z

@matthewbauer No, I think I only ever tested this with arm64

matthewbauer · 2018-06-25T18:10:08Z

pkgs/development/compilers/ghc/8.4.2.nix

@@ -22,7 +22,7 @@

 , # Whether to build dynamic libs for the standard library (on the target
  # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt


Did you ever get this to build a valid .apk? I think we need shared here for the Haskell activity stuff to link. Maybe it worked for you though?

I believe the old stuff from reflex-platform used this and successfully built APKs. I did not try it with this branch though.

ElvishJerricco added 2 commits May 7, 2018 23:57

Set the C standard when building GHC

0afb45d

Should this be in cc-wrapper?

Don't enableShared in GHC when using android prebuilt

8012aee

ElvishJerricco requested a review from peti as a code owner May 9, 2018 08:28

ElvishJerricco changed the title ~~Fix android prebuilt ghc~~ Fix android prebuilt ghc [Fixes #40194] May 9, 2018

GrahamcOfBorg added 6.topic: haskell 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 9, 2018

ElvishJerricco commented May 9, 2018

View reviewed changes

Ericson2314 reviewed May 9, 2018

View reviewed changes

Fix hsc2hs cross compiler build

9dadb9e

ElvishJerricco force-pushed the fix-android-prebuilt-ghc branch from 7e698da to 9dadb9e Compare May 10, 2018 03:53

Ericson2314 merged commit 83fdfb9 into NixOS:master May 10, 2018

Ericson2314 mentioned this pull request May 10, 2018

Can't build GHC 8.4.2 for android #40194

Closed

matthewbauer reviewed Jun 25, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix android prebuilt ghc [Fixes #40194] #40210

Fix android prebuilt ghc [Fixes #40194] #40210

ElvishJerricco commented May 9, 2018

ElvishJerricco commented May 9, 2018

ElvishJerricco commented May 9, 2018

ElvishJerricco May 9, 2018

Ericson2314 May 9, 2018

Ericson2314 left a comment

Ericson2314 May 9, 2018

ElvishJerricco May 9, 2018

Ericson2314 May 10, 2018

Ericson2314 May 9, 2018

Ericson2314 May 9, 2018

Ericson2314 May 9, 2018

ElvishJerricco May 9, 2018

Ericson2314 May 9, 2018

ElvishJerricco May 10, 2018

matthewbauer commented Jun 22, 2018

ElvishJerricco commented Jun 22, 2018

matthewbauer Jun 25, 2018

ElvishJerricco Jun 25, 2018

		@@ -79,6 +81,8 @@ stdenv.mkDerivation rec {

		outputs = [ "out" "doc" ];

		patches = [./8.4.2-hsc2hs-cross-build.patch];

		@@ -0,0 +1,41 @@
		Submodule utils/hsc2hs 9483ad1006..738f3666c8:

Fix android prebuilt ghc [Fixes #40194] #40210

Fix android prebuilt ghc [Fixes #40194] #40210

Conversation

ElvishJerricco commented May 9, 2018

Motivation for this change

Things done

ElvishJerricco commented May 9, 2018

ElvishJerricco commented May 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ericson2314 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthewbauer commented Jun 22, 2018

ElvishJerricco commented Jun 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment