summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-07 15:30:50 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-07 15:30:50 -0400
commitf9f362ae2e0d52be4013556e6b91735cda7013d6 (patch)
tree73f618ab4e0dc23b4620a6a7f6a823a89470a081
parentbc29af157a7ea69ff8e197a7d3134cbe33ae707e (diff)
fix -fPIE option
-rwxr-xr-xstandalone/android/buildapk5
1 files changed, 3 insertions, 2 deletions
diff --git a/standalone/android/buildapk b/standalone/android/buildapk
index 4c50cacf0..1d02ffc7d 100755
--- a/standalone/android/buildapk
+++ b/standalone/android/buildapk
@@ -15,6 +15,7 @@ VER="$(perl -e '$_=<>;print m/\((.*?)\)/'<../../CHANGELOG)"
wrap () {
echo "#!/bin/sh -e" > "$2"
+ echo "echo \"$1 added options: $2\" >&2" >> "$2"
echo "$1 $3" >> "$2"
chmod +x "$2"
}
@@ -34,10 +35,10 @@ if [ "$androidversion" = 5 ]; then
wrap "$src" "$dest" "-pie"
;;
*-gcc)
- wrap "$src" "$dest" "-pie" "-fPIE"
+ wrap "$src" "$dest" "-pie -fPIE"
;;
*'-g++')
- wrap "$src" "$dest" "-pie" "-fPIE"
+ wrap "$src" "$dest" "-pie -fPIE"
;;
*)
cp -a "$src" "$dest"