Skip to content

Commit ef910d3

Browse files
minrkmoto-timo
authored andcommitted
fix: duplicate ninja rules for v8 (cross-compiling)
avoids duplicate ninja rules for v8 used in host and target From: minrk/node@5e533cb Signed-off-by: Thomas Petazzoni <[email protected]> Reported in nodejs/node#46690 and nodejs/node#37441 Minor refactoring as recommended by Christian Clauss. Signed-off-by: Tim Orling <[email protected]>
1 parent 2f79158 commit ef910d3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pylib/gyp/generator/ninja.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# the start of a string, while $| is used for variables that can appear
4343
# anywhere in a string.
4444
"INTERMEDIATE_DIR": "$!INTERMEDIATE_DIR",
45-
"SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/gen",
45+
"SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/$|OBJ/gen",
4646
"PRODUCT_DIR": "$!PRODUCT_DIR",
4747
"CONFIGURATION_NAME": "$|CONFIGURATION_NAME",
4848
# Special variables that may be used by gyp 'rule' targets.
@@ -285,7 +285,8 @@ def ExpandSpecial(self, path, product_dir=None):
285285
CONFIGURATION_NAME = "$|CONFIGURATION_NAME"
286286
path = path.replace(CONFIGURATION_NAME, self.config_name)
287287

288-
return path
288+
obj = "obj" if self.toolset == "target" else f"obj.{self.toolset}"
289+
return path.replace("$|OBJ", obj)
289290

290291
def ExpandRuleVariables(self, path, root, dirname, source, ext, name):
291292
if self.flavor == "win":

0 commit comments

Comments
 (0)