diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-02 15:46:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-02 15:46:05 -0400 |
| commit | 6d6c215be98c55fbebe377b45afd48b0942b4721 (patch) | |
| tree | bfc7463e8f6e86127edce41a17946b659b099d50 /standalone/android/install-haskell-packages | |
| parent | aba9315cdec904618c6fea307e0552f52ee53778 (diff) | |
android: install exact same package versions for host and cross compiler
Diffstat (limited to 'standalone/android/install-haskell-packages')
| -rwxr-xr-x | standalone/android/install-haskell-packages | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 4e7f4a24b..29be5f95b 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -8,10 +8,6 @@ # versions that have been gotten working. To update, delete the # cabal.config, run this script with an empty cabal and fix up the broken # patches, and then use cabal freeze to generate a new cabal.config. -# -# This only installs haskell packages for ghc-android. The host ghc -# also needs to have all the git-annex build deps installed, in similar -# versions. Those are installed from Debian packages using apt. set -e @@ -130,11 +126,13 @@ EOF installgitannexdeps -fAndroid -f-Pairing } -# native cabal needs its own update +setupcabal + +# Install packages for host ghc. cabal update +installgitannexdeps +# Install packages for cross ghc, with patches as necessary. PATH=$HOME/.ghc/$(cat abiversion)/bin:$HOME/.ghc/$(cat abiversion)/arm-linux-androideabi/bin:$PATH -setupcabal cabal update - install_pkgs |