diff options
Diffstat (limited to 'standalone/android/buildapk')
| -rwxr-xr-x | standalone/android/buildapk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/standalone/android/buildapk b/standalone/android/buildapk index 980803f71..34ddd9537 100755 --- a/standalone/android/buildapk +++ b/standalone/android/buildapk @@ -25,11 +25,11 @@ androidtoolchain="$HOME/.ghc/$(cat abiversion)/bin" # For Android 5, use a wrapped version of the C compiler, # which sets PIE build flags. if [ "$androidversion" = 5 ]; then - rm -rf "$androidtoolchain/5.0" - mkdir -p "$androidtoolchain/5.0" + rm -rf "$androidtoolchain/5" + mkdir -p "$androidtoolchain/5" for f in $(find "$androidtoolchain" -maxdepth 1 -not -type d -printf '%f\n'); do src="$androidtoolchain/$f" - dest="$androidtoolchain/5.0/$f" + dest="$androidtoolchain/5/$f" case "$f" in *-ld*) wrap "$src" "$dest" "-pie" @@ -45,7 +45,7 @@ if [ "$androidversion" = 5 ]; then ;; esac done - PATH="$androidtoolchain:$PATH/5" + PATH="$androidtoolchain/5:$PATH" else PATH="$androidtoolchain:$PATH" fi |