Merge branch 'xcode-fastbuild-support-fix-custom-sdk' into 'main'

untouch options["SDKRoot"] when custom SDK set See merge request Sharpmake/sharpmake!440
ubisoft · Sep 13, 2023 · 490f9ea · 490f9ea
2 parents 965bb6d + 5508654
commit 490f9ea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs
@@ -58,7 +58,8 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.XCode.Compiler.SDKRoot customSdkRoot = Options.GetObject<Options.XCode.Compiler.SDKRoot>(conf);
                 if (customSdkRoot != null)
                 {
-                    options["SDKRoot"] = customSdkRoot.Value;
+                    // Xcode doesn't accept the customized sdk path as SDKRoot
+                    //options["SDKRoot"] = customSdkRoot.Value;
                     cmdLineOptions["SDKRoot"] = $"-isysroot {customSdkRoot.Value}";
                 }
 

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacOsPlatform.cs
@@ -48,7 +48,8 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.XCode.Compiler.SDKRoot customSdkRoot = Options.GetObject<Options.XCode.Compiler.SDKRoot>(conf);
                 if (customSdkRoot != null)
                 {
-                    options["SDKRoot"] = customSdkRoot.Value;
+                    // Xcode doesn't accept the customized sdk path as SDKRoot
+                    //options["SDKRoot"] = customSdkRoot.Value;
                     cmdLineOptions["SDKRoot"] = $"-isysroot {customSdkRoot.Value}";
                 }
 

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs
@@ -58,7 +58,8 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.XCode.Compiler.SDKRoot customSdkRoot = Options.GetObject<Options.XCode.Compiler.SDKRoot>(conf);
                 if (customSdkRoot != null)
                 {
-                    options["SDKRoot"] = customSdkRoot.Value;
+                    // Xcode doesn't accept the customized sdk path as SDKRoot
+                    //options["SDKRoot"] = customSdkRoot.Value;
                     cmdLineOptions["SDKRoot"] = $"-isysroot {customSdkRoot.Value}";
                 }
 

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/tvOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/tvOsPlatform.cs
@@ -57,7 +57,8 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.XCode.Compiler.SDKRoot customSdkRoot = Options.GetObject<Options.XCode.Compiler.SDKRoot>(conf);
                 if (customSdkRoot != null)
                 {
-                    options["SDKRoot"] = customSdkRoot.Value;
+                    // Xcode doesn't accept the customized sdk path as SDKRoot
+                    //options["SDKRoot"] = customSdkRoot.Value;
                     cmdLineOptions["SDKRoot"] = $"-isysroot {customSdkRoot.Value}";
                 }
 

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/watchOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/watchOsPlatform.cs
@@ -56,7 +56,8 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.XCode.Compiler.SDKRoot customSdkRoot = Options.GetObject<Options.XCode.Compiler.SDKRoot>(conf);
                 if (customSdkRoot != null)
                 {
-                    options["SDKRoot"] = customSdkRoot.Value;
+                    // Xcode doesn't accept the customized sdk path as SDKRoot
+                    //options["SDKRoot"] = customSdkRoot.Value;
                     cmdLineOptions["SDKRoot"] = $"-isysroot {customSdkRoot.Value}";
                 }