From ef910d391109ffb3419b447cc95a51c1b99fd2a8 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 19 Feb 2021 11:57:04 +0100 Subject: [PATCH] fix: duplicate ninja rules for v8 (cross-compiling) avoids duplicate ninja rules for v8 used in host and target From: https://github.com/minrk/node/commit/5e533cb943eef68b270f55f0cba02c0ec67c699d Signed-off-by: Thomas Petazzoni Reported in https://github.com/nodejs/node/issues/46690 and https://github.com/nodejs/node/issues/37441 Minor refactoring as recommended by Christian Clauss. Signed-off-by: Tim Orling --- pylib/gyp/generator/ninja.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py index 3644b266..48f6fe6e 100644 --- a/pylib/gyp/generator/ninja.py +++ b/pylib/gyp/generator/ninja.py @@ -42,7 +42,7 @@ # the start of a string, while $| is used for variables that can appear # anywhere in a string. "INTERMEDIATE_DIR": "$!INTERMEDIATE_DIR", - "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/gen", + "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/$|OBJ/gen", "PRODUCT_DIR": "$!PRODUCT_DIR", "CONFIGURATION_NAME": "$|CONFIGURATION_NAME", # Special variables that may be used by gyp 'rule' targets. @@ -285,7 +285,8 @@ def ExpandSpecial(self, path, product_dir=None): CONFIGURATION_NAME = "$|CONFIGURATION_NAME" path = path.replace(CONFIGURATION_NAME, self.config_name) - return path + obj = "obj" if self.toolset == "target" else f"obj.{self.toolset}" + return path.replace("$|OBJ", obj) def ExpandRuleVariables(self, path, root, dirname, source, ext, name): if self.flavor == "win":