From ea8742bc1657cd0aae32ac555560c8228795488f Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Thu, 18 Jan 2024 12:05:36 +0000 Subject: ash: workaround environment issue in Windows on ARM The environment is handled differently in ARM64 Windows. Assignments to 'environ' result in a compiler error. Omit the offending code for now. NOFORK applets will cause a fork. --- shell/ash.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 3c57c4577..e74662d8d 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -11662,9 +11662,10 @@ evalcommand(union node *cmd, int flags) default: { +//TODO: find a better solution for Windows on ARM than ignoring NOFORK #if ENABLE_FEATURE_SH_STANDALONE \ && ENABLE_FEATURE_SH_NOFORK \ - && NUM_APPLETS > 1 + && NUM_APPLETS > 1 && !(defined(_ARM64_) && ENABLE_PLATFORM_MINGW32) /* (1) BUG: if variables are set, we need to fork, or save/restore them * around run_nofork_applet() call. * (2) Should this check also be done in forkshell()? -- cgit v1.2.3-55-g6feb