fix: EmbeddedTargetOs on IBM i with Python 3.9

abmusse · V8 LUCI CQ · commit 8ec2651fbdd8 · 2023-09-14T10:09:35.000Z
For some context, Python 3.9 on IBM i returns "os400" for sys.platform instead of "aix". We used to build with Python 3.6 which returned "aix" as the platform When attempting to build Node.js with python 3.9 on IBM i we run into a build error. Ref: nodejs/node#48056 Ref: nodejs/node#48056 (comment) I'm not quite sure where target_os is being passed down to the function ToEmbeddedTargetOs. It seems as though target_os is being generated from sys.platform or similar call from python as we started running into this issue after building with Python 3.9. This PR supersedes initial changes proposed in: https://chromium-review.googlesource.com/c/v8/v8/+/4259330 This PR contains the minimal changes to successfully build Node.js (builds v8 as an internal dep) on IBM i with Python 3.9. Change-Id: I32d43197bce994a72a0d85091e91f80eeea4482d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4846413 Commit-Queue: Jakob Linke <jgruber@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Jakob Linke <jgruber@chromium.org> Cr-Commit-Position: refs/heads/main@{#89981}
diff --git a/src/snapshot/embedded/platform-embedded-file-writer-base.cc b/src/snapshot/embedded/platform-embedded-file-writer-base.cc
@@ -130,7 +130,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) {
   }
 
   std::string string(s);
-  if (string == "aix") {
+  // Python 3.9+ on IBM i returns os400 as sys.platform instead of aix
+  if (string == "aix" || string == "os400") {
     return EmbeddedTargetOs::kAIX;
   } else if (string == "chromeos") {
     return EmbeddedTargetOs::kChromeOS;

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`std::string string(s);`
`133`		`- if (string == "aix") {`
	`133`	`+ // Python 3.9+ on IBM i returns os400 as sys.platform instead of aix`
	`134`	`+ if (string == "aix" \|\| string == "os400") {`
`134`	`135`	`return EmbeddedTargetOs::kAIX;`
`135`	`136`	`} else if (string == "chromeos") {`
`136`	`137`	`return EmbeddedTargetOs::kChromeOS;`