build: fix arm toolchain

CoderLine · Aug 11, 2024 · 7339847 · 7339847
1 parent 9662e7c
commit 7339847
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/build/Build.LibSkia.cs b/build/Build.LibSkia.cs
@@ -136,7 +136,7 @@ partial class Build
             {
                 var newSources = "# AlphaSkia Patch FreeType\n";
                 // ensure we have freetype available
-                newSources += "  include_dirs = [ \"../externals/freetype/include\" ]\n";
+                newSources += "  include_dirs = [ \"externals/freetype/include\" ]\n";
                 newSources += "  sources += [\n";
                 newSources += "    \"src/ports/SkFontHost_FreeType.cpp\",\n";
                 newSources += "    \"src/ports/SkFontHost_FreeType_common.cpp\",\n";

diff --git a/build/Build.Native.cs b/build/Build.Native.cs
@@ -391,8 +391,11 @@ void PatchSkiaToolchain()
         var toolChainBuildFile = SkiaPath / "gn" / "toolchain" / "BUILD.gn";
         var oldToolChainSource = toolChainBuildFile.ReadAllText();
         toolChainBuildFile.WriteAllText(oldToolChainSource.Replace(
-            "env_setup = \"$shell $win_sdk/bin/SetEnv.cmd /x86",
-            "# env_setup = \"$shell $win_sdk/bin/SetEnv.cmd /x86"
+            "  env_setup = \"$shell $win_sdk/bin/SetEnv.cmd /x86",
+            "  # env_setup = \"$shell $win_sdk/bin/SetEnv.cmd /x86"
+        ).Replace(
+            "  env_setup = \"$shell set \\\"PATH=%PATH%;$win_vc\\\\Tools\\\\MSVC\\\\$win_toolchain_version\\\\bin\\\\HostX64\\\\x64\\\" && \"",
+            "  # env_setup = \"$shell set \\\"PATH=%PATH%;$win_vc\\\\Tools\\\\MSVC\\\\$win_toolchain_version\\\\bin\\\\HostX64\\\\x64\\\" && \""
         ));
     }
 }