Mercurial > gnulib
changeset 40141:449e6729b53f
sh-filename: Add support for Android 4.3.
* m4/sh-filename.m4 (gl_SH_FILENAME): Set to "sh" on Android.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 26 Jan 2019 15:40:31 +0100 |
| parents | 81f075eaa990 |
| children | ba80f688c0e7 |
| files | ChangeLog m4/sh-filename.m4 |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 26 15:23:19 2019 +0100 +++ b/ChangeLog Sat Jan 26 15:40:31 2019 +0100 @@ -1,3 +1,8 @@ +2019-01-26 Bruno Haible <bruno@clisp.org> + + sh-filename: Add support for Android 4.3. + * m4/sh-filename.m4 (gl_SH_FILENAME): Set to "sh" on Android. + 2019-01-26 Bruno Haible <bruno@clisp.org> ptsname_r: Work around bug on Android 4.3.
--- a/m4/sh-filename.m4 Sat Jan 26 15:23:19 2019 +0100 +++ b/m4/sh-filename.m4 Sat Jan 26 15:40:31 2019 +0100 @@ -1,4 +1,4 @@ -# sh-filename.m4 serial 1 +# sh-filename.m4 serial 2 dnl Copyright (C) 2018-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,9 +10,11 @@ [ AH_VERBATIM([SH_FILENAME], [/* File name of the Bourne shell. */ -#if defined __CYGWIN__ -/* Omit the directory part because for 32-bit Cygwin programs in a - 64-bit Cygwin environment, the Cygwin mounts are not visible. */ +#if defined __CYGWIN__ || defined __ANDROID__ +/* Omit the directory part because + - For 32-bit Cygwin programs in a 64-bit Cygwin environment, the Cygwin + mounts are not visible. + - On Android, /bin/sh does not exist. It's /system/bin/sh instead. */ # define BOURNE_SHELL "sh" #else # define BOURNE_SHELL "/bin/sh"