From ed261f1c1ae9a9619cdb72b1c0734d7a43df6f9a Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Fri, 16 Sep 2022 13:35:20 -0500
Subject: [PATCH] Add RID argument to llvm-project repo.proj. (#14534)

---
 src/SourceBuild/tarball/content/repos/llvm-project.proj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj
index c2c23cba4..addb0457c 100644
--- a/src/SourceBuild/tarball/content/repos/llvm-project.proj
+++ b/src/SourceBuild/tarball/content/repos/llvm-project.proj
@@ -2,7 +2,10 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs)</BuildCommand>
+    <BuildCommandArgs/>
+    <!-- llvm-project always builds x64 unless told otherwisse -->
+    <BuildCommandArgs>$(BuildCommandArgs) /p:OutputRid=$(PortableRid)</BuildCommandArgs>
+    <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs)</BuildCommand>
 
     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
     <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>