From 56925b93ffa40fd93f6e88ff53b4aba99baebe32 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Mon, 17 Apr 2023 22:12:03 +0000
Subject: [PATCH] Fix R2R test build

---
 src/tests/build.proj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/tests/build.proj b/src/tests/build.proj
index 8a00ffa945fe0c..953dfd1d36db28 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -527,9 +527,7 @@
 
     <PropertyGroup>
       <CrossgenDir>$(__BinDir)</CrossgenDir>
-      <CrossgenDir Condition="'$(TargetArchitecture)' == 'arm'">$(CrossgenDir)\x64</CrossgenDir>
-      <CrossgenDir Condition="'$(TargetArchitecture)' == 'arm64'">$(CrossgenDir)\x64</CrossgenDir>
-      <CrossgenDir Condition="'$(TargetArchitecture)' == 'x86'">$(CrossgenDir)\x64</CrossgenDir>
+      <CrossgenDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(CrossgenDir)\$(BuildArchitecture)</CrossgenDir>
 
       <CrossgenOutputDir>$(__TestIntermediatesDir)\crossgen.out</CrossgenOutputDir>