From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 30 Sep 2021 12:01:51 +0000 (+0300)
Subject: Remove whitespaces in MakeFlags environment variable
X-Git-Tag: v1.16.0~4
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=651c41ddfbc19069cb0e56abb6fe4f6b3e8791ae

Remove whitespaces in MakeFlags environment variable
---

diff --git a/run.go b/run.go
index f356d81..b836ad9 100644
--- a/run.go
+++ b/run.go
@@ -408,10 +408,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		} else {
 			cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
 			cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
-			cmd.Env = append(cmd.Env, fmt.Sprintf(
-				"%s=%s %s%d,%d",
-				MakeFlagsName, MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
-			))
+			makeFlags := fmt.Sprintf(
+				"%s %s%d,%d", MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
+			)
+			makeFlags = strings.Trim(makeFlags, " ")
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", MakeFlagsName, makeFlags))
 			fdNum += 2
 			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvJSToken, jsToken))
 		}