diff options
author | Richard Earnshaw <rearnsha@arm.com> | 2000-04-08 13:35:53 +0000 |
---|---|---|
committer | Richard Earnshaw <rearnsha@arm.com> | 2000-04-08 13:35:53 +0000 |
commit | a8aec5d453f43d7cb393600b826f519d0ce015a0 (patch) | |
tree | 41674a640d14edc21fe187daedda3a01a0434f25 /gcc/fixinc/server.c | |
parent | 4c2a925528228f220f8da3c30fb71114669aedb4 (diff) |
* Merge trunk code from tag merged-arm-thumb-backend-merge_20000408
into branch.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/merged-arm-thumb-backend-branch@33027 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fixinc/server.c')
-rw-r--r-- | gcc/fixinc/server.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c index 676df8cd0f6..5d737ac70ac 100644 --- a/gcc/fixinc/server.c +++ b/gcc/fixinc/server.c @@ -235,6 +235,28 @@ server_setup () p_cur_dir = getcwd ((char *) NULL, MAXPATHLEN + 1); } +/* + * find_shell + * + * Locate a shell suitable for use. For various reasons + * (like the use of "trap" in server_setup(), it must be a + * Bourne-like shell. + * + * Most of the time, /bin/sh is preferred, but sometimes + * it's quite broken (like on Ultrix). autoconf lets you + * override with $CONFIG_SHELL, so we do the same. + */ + +static char * +find_shell () +{ + char * shell = getenv ("CONFIG_SHELL"); + if (shell) + return shell; + + return "/bin/sh"; +} + /* * run_shell @@ -266,6 +288,8 @@ run_shell (pz_cmd) THEN try to start it. */ if (server_id == NULLPROCESS) { + def_args[0] = find_shell (); + server_id = proc2_fopen (&server_pair, def_args); if (server_id > 0) server_setup (); |