From 974e626b98e3c724d3c4dfd069088f3a9e5cb18f Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:45:51 +0300 Subject: [PATCH 1/6] Normalize native compiler prop to CppCompilerAndLinker --- eng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 07b5c2a6c632ae..d6b0ae14212ae1 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -464,7 +464,7 @@ while [[ $# -gt 0 ]]; do -clang*) compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged) - arguments+=("/p:Compiler=$compiler" "/p:CppCompilerAndLinker=$compiler") + arguments+=("/p:CppCompilerAndLinker=$compiler") shift 1 ;; @@ -479,7 +479,7 @@ while [[ $# -gt 0 ]]; do -gcc*) compiler="${opt/#-/}" # -gcc-9 => gcc-9 or gcc-9 => (unchanged) - arguments+=("/p:Compiler=$compiler" "/p:CppCompilerAndLinker=$compiler") + arguments+=("/p:CppCompilerAndLinker=$compiler") shift 1 ;; From c4db93ace658fa7dac19a91802133e539fa82581 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:47:58 +0300 Subject: [PATCH 2/6] Update runtime.proj --- src/coreclr/runtime.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj index 5d085be67b1061..978d9a55a25e1b 100644 --- a/src/coreclr/runtime.proj +++ b/src/coreclr/runtime.proj @@ -24,7 +24,7 @@ <_CoreClrBuildArg Include="@(_CMakeArgs->'-cmakeargs "%(Identity)"')" /> <_CoreClrBuildArg Condition="'$(TargetArchitecture)' != ''" Include="-$(TargetArchitecture)" /> <_CoreClrBuildArg Include="-$(Configuration.ToLower())" /> - <_CoreClrBuildArg Include="$(Compiler)" /> + <_CoreClrBuildArg Include="$(CppCompilerAndLinker)" /> <_CoreClrBuildArg Condition="'$(ConfigureOnly)' == 'true'" Include="-configureonly" /> <_CoreClrBuildArg Condition="'$(ContinuousIntegrationBuild)' == 'true'" Include="-ci" /> <_CoreClrBuildArg Condition="'$(CrossBuild)' == 'true'" Include="-cross" /> From 36b1ecd7bc2d0984c317bbd460ee2e12dccabc06 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:48:33 +0300 Subject: [PATCH 3/6] Update NativeCompiler property for Unix builds --- .../tests/TestAssets/NativeExports/NativeExports.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj index 1c49223375914e..1bf4d2d611c556 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj @@ -40,7 +40,7 @@ - $(Compiler) + $(CppCompilerAndLinker) clang From 7d86bea364c88499285f6c221da50f5a2eb2c6be Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:49:01 +0300 Subject: [PATCH 4/6] Change MonoCCompiler to use CppCompilerAndLinker --- src/mono/mono.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 910af625dbd4d6..c3844d6351437a 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -48,7 +48,7 @@ $([MSBuild]::NormalizePath('$(MonoObjCrossDir)', 'config.h')) true true - $(Compiler) + $(CppCompilerAndLinker) clang <_CompilerTargetArch Condition="'$(AotHostArchitecture)' == ''">$(Platform) <_CompilerTargetArch Condition="'$(AotHostArchitecture)' != ''">$(AotHostArchitecture) From 723e29b3ece5f426096e0d45c48621e7ed7723af Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:49:30 +0300 Subject: [PATCH 5/6] Update corehost.proj --- src/native/corehost/corehost.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj index bb85c35489f1c2..bc87bfbf7692bf 100644 --- a/src/native/corehost/corehost.proj +++ b/src/native/corehost/corehost.proj @@ -80,7 +80,7 @@ $(BuildArgs) -portablebuild=false $(BuildArgs) -keepnativesymbols $(BuildArgs) -cross - $(BuildArgs) $(Compiler) + $(BuildArgs) $(CppCompilerAndLinker) $(BuildArgs) -cmakeargs "$(CMakeArgs)" $(BuildArgs) -ninja $(BuildArgs) -ninja false From 2e519031f4914fa486481984ca88d528ac45cbf7 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:49:58 +0300 Subject: [PATCH 6/6] Update compiler variable in build-native.proj --- src/native/libs/build-native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/libs/build-native.proj b/src/native/libs/build-native.proj index 2e9588da2dc019..f948d15426d434 100644 --- a/src/native/libs/build-native.proj +++ b/src/native/libs/build-native.proj @@ -57,7 +57,7 @@ used to force a specific compiler toolset. --> <_BuildNativeCompilerArg Condition="'$(BuildNativeCompiler)' != ''"> $(BuildNativeCompiler) - <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessorCountArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_KeepNativeSymbolsBuildArg) $(Compiler) + <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessorCountArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_KeepNativeSymbolsBuildArg) $(CppCompilerAndLinker) <_BuildNativeBuildCommand>"$(MSBuildThisFileDirectory)build-native.sh" $(_BuildNativeUnixArgs)