summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-30 16:42:49 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-10-30 16:42:49 +0059
commitc94c8c9eef2ce0388f8fa2232b86c15042fdcdf4 (patch)
treea373d89ef687531bcf6fed1e1b9b5b1b539a5906
parent111b2a95b89ea2bcc32ad0ce99e3112eb4f2af25 (diff)
downloadnative-toolchain-c94c8c9eef2ce0388f8fa2232b86c15042fdcdf4.tar.gz
native-toolchain: Fix default shell on Android
Change-Id: I72645e2b473f5059b0aad8f50991373dba37a658 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rwxr-xr-xbuild.sh3
-rw-r--r--make-3.82-android-default-shell.patch14
2 files changed, 17 insertions, 0 deletions
diff --git a/build.sh b/build.sh
index c5eb61b..5086454 100755
--- a/build.sh
+++ b/build.sh
@@ -78,6 +78,9 @@ fi
if ! [ -d make-$MAKE ]; then
wget ftp://ftp.gnu.org/gnu/make/make-$MAKE.tar.bz2
tar xf make-$MAKE.tar.bz2
+ cd make-$MAKE
+ patch -p1 <"$DIR/make-3.82-android-default-shell.patch"
+ cd ..
fi
if ! [ -d ncurses-$NCURSES ]; then
wget ftp://invisible-island.net/ncurses/ncurses-$NCURSES.tar.gz
diff --git a/make-3.82-android-default-shell.patch b/make-3.82-android-default-shell.patch
new file mode 100644
index 0000000..19f229a
--- /dev/null
+++ b/make-3.82-android-default-shell.patch
@@ -0,0 +1,14 @@
+--- make-3.82/job.c.bero 2012-10-30 16:40:20.379593307 +0100
++++ make-3.82/job.c 2012-10-30 16:41:17.095062673 +0100
+@@ -69,6 +69,11 @@ int batch_mode_shell = 0;
+ char default_shell[] = "";
+ int batch_mode_shell = 0;
+
++#elif defined (__BIONIC__) /* Android */
++
++char default_shell[] = "/system/bin/sh";
++int batch_mode_shell = 0;
++
+ #else
+
+ char default_shell[] = "/bin/sh";