Merge branch 'fix/customfilebuildstep-relative-executable' into 'main'

Fix CustomFileBuildStep to not make Executable paths relative when UseExecutableFromSystemPath is set See merge request Sharpmake/sharpmake!582
ubisoft · Nov 29, 2024 · 669ceb8 · 669ceb8
2 parents 4bee97e + 786bc35
commit 669ceb8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Sharpmake/Project.Configuration.cs b/Sharpmake/Project.Configuration.cs
@@ -2322,7 +2322,10 @@ public virtual CustomFileBuildStepData MakePathRelative(Resolver resolver, Func<
                 {
                     var relativeData = new CustomFileBuildStepData();
                     relativeData.KeyInput = MakeRelativeTool(KeyInput, true);
-                    relativeData.Executable = MakeRelativeTool(Executable, true);
+                    if (!UseExecutableFromSystemPath)
+                        relativeData.Executable = MakeRelativeTool(Executable, true);
+                    else
+                        relativeData.Executable = Executable;
                     relativeData.Output = MakeRelativeTool(Output, true);
                     using (resolver.NewScopedParameter("input", relativeData.KeyInput))
                     using (resolver.NewScopedParameter("output", relativeData.Output))