From fcef3d24be40dfd8ce5e7bbd94ab601c05a1fd75 Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Thu, 20 Oct 2022 14:30:23 +0900 Subject: [PATCH 1/3] Fixed crossbuild for clang-9 --- eng/testing/tests.singlefile.targets | 2 +- src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index ebe2867d78249..655bc6798f13b 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -22,7 +22,7 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) clang-15 - clang-9 + clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index 9ce085ee29832..cdd137c14b0e0 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -32,7 +32,7 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) clang-15 - clang-9 + clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) From 0eab098e3d8fb9e209d169f1d5344d2740c3a9c3 Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Mon, 24 Oct 2022 16:20:19 +0900 Subject: [PATCH 2/3] Add condition in CppCompilerAndLinker --- eng/testing/tests.singlefile.targets | 2 +- src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index 655bc6798f13b..ce0e3fc26eb39 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -22,7 +22,7 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) clang-15 - clang + clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index cdd137c14b0e0..d959213ffd6da 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -32,7 +32,7 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) clang-15 - clang + clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) From c917b2ee06d456790407a430ebc161d5d52657dd Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Wed, 2 Nov 2022 11:54:39 +0900 Subject: [PATCH 3/3] Remove CppCompilerAndLinker --- eng/testing/tests.singlefile.targets | 2 -- src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 -- 2 files changed, 4 deletions(-) diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index ce0e3fc26eb39..3c9cec6cdac7d 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -21,8 +21,6 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) - clang-15 - clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index d959213ffd6da..3b64b06b0cafb 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -31,8 +31,6 @@ $(CoreCLRILCompilerDir) $(CoreCLRCrossILCompilerDir) - clang-15 - clang $(ROOTFS_DIR) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir)