Allow more supported target architectures for R2RDump (dotnet#295)

* Allow more supported target architectures for R2RDump in build-coredistools.cmd build-coredistools.sh * Trigger coredistools pipeline when build scripts are changed in coredistools.yml
JulieLeeMSFT · Oct 5, 2020 · aee7b43 · aee7b43
1 parent 1d0dd7f
commit aee7b43
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/build-coredistools.cmd b/build-coredistools.cmd
@@ -2,24 +2,23 @@
 setlocal EnableDelayedExpansion EnableExtensions
 
 set TargetOSArchitecture=%1
+set LLVMTargetsToBuild=AArch64;ARM;X86
 
 if /i "%TargetOSArchitecture%" == "win-arm" (
     set GeneratorPlatform=ARM
     set LLVMDefaultTargetTriple=thumbv7-pc-windows-msvc
     set LLVMHostTriple=arm-pc-windows-msvc
-    set LLVMTargetsToBuild=ARM
+    set LLVMTargetsToBuild=AArch64;ARM
 ) else if /i "%TargetOSArchitecture%" == "win-arm64" (
     set GeneratorPlatform=ARM64
     set LLVMHostTriple=aarch64-pc-windows-msvc
-    set LLVMTargetsToBuild=AArch64
+    set LLVMTargetsToBuild=AArch64;ARM
 ) else if /i "%TargetOSArchitecture%" == "win-x64" (
     set GeneratorPlatform=x64
     set LLVMHostTriple=x86_64-pc-windows-msvc
-    set LLVMTargetsToBuild=AArch64;X86
 ) else if /i "%TargetOSArchitecture%" == "win-x86" (
     set GeneratorPlatform=Win32
     set LLVMHostTriple=i686-pc-windows-msvc
-    set LLVMTargetsToBuild=ARM;X86
 ) else (
     echo ERROR: Unknown target OS and architecture: %TargetOSArchitecture%
     exit /b 1

diff --git a/build-coredistools.sh b/build-coredistools.sh
@@ -8,19 +8,19 @@ case "$TargetOSArchitecture" in
         CrossCompiling=1
         LLVMDefaultTargetTriple=thumbv7-linux-gnueabihf
         LLVMHostTriple=arm-linux-gnueabihf
-        LLVMTargetsToBuild=ARM
+        LLVMTargetsToBuild="AArch64;ARM"
         ;;
 
     linux-arm64)
         CrossCompiling=1
         LLVMDefaultTargetTriple=aarch64-linux-gnu
         LLVMHostTriple=aarch64-linux-gnu
-        LLVMTargetsToBuild=AArch64
+        LLVMTargetsToBuild="AArch64;ARM"
         ;;
 
     linux-x64|osx-x64)
         CrossCompiling=0
-        LLVMTargetsToBuild="AArch64;X86"
+        LLVMTargetsToBuild="AArch64;ARM;X86"
         ;;
 
     *)

diff --git a/coredistools.yml b/coredistools.yml
@@ -6,6 +6,10 @@ pr:
     include:
     - eng/*
     - src/coredistools/*
+    - build-coredistools.cmd
+    - build-coredistools.sh
+    - build-tblgen.cmd
+    - pack-coredistools.cmd
 
 trigger:
   branches:
@@ -15,6 +19,10 @@ trigger:
     include:
     - eng/*
     - src/coredistools/*
+    - build-coredistools.cmd
+    - build-coredistools.sh
+    - build-tblgen.cmd
+    - pack-coredistools.cmd
 
 resources:
   containers: