Windows/aarch64 installer fix: file utility now reports ARM64 instead of

Aarch64.


git-svn-id: https://svn.r-project.org/R/trunk@87888 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: kalibera

src/gnuwin32/installer/JRins.R

@@ -54,7 +54,8 @@
                     intern=TRUE)
         if (grepl("x86-64", fout, fixed = TRUE))
             cat("ArchitecturesInstallIn64BitMode=x64 arm64\n", file = con)
-        else if (grepl("Aarch64", fout, fixed = TRUE)) {
+        else if (grepl("Aarch64", fout, fixed = TRUE)
+                 || grepl("ARM64", fout, fixed = TRUE)) {
             cat("ArchitecturesInstallIn64BitMode=arm64\n", file = con)
             cat("ArchitecturesAllowed=arm64\n", file = con)
             aarch64 <- TRUE

src/gnuwin32/installer/Makefile

@@ -40,14 +40,18 @@ SHARE_DIRS = R dictionaries encodings licenses make Rd texmf zoneinfo
 all: $(RPREFIX)-win.exe
 msi: $(RPREFIX)-$(SUFF).msi
 
-RBUILD := $(if $(findstring Aarch64,$(shell file "$(R_HOME)/bin/R.exe")),aarch64,x86_64)
+RBUILD := $(if $(findstring Aarch64,\
+                            $(subst ARM64,Aarch64,$(shell file "$(R_HOME)/bin/R.exe"))),\
+               aarch64,x86_64)
 
 ifeq ($(CROSS_BUILD),)
   RTARGET := $(RBUILD)
   R_ARCH_TARGET := $(R_ARCH)
 else
   R_HOME_CROSS = $(CROSS_BUILD)
-  RTARGET := $(if $(findstring Aarch64,$(shell file "$(R_HOME_CROSS)/bin/R.exe")),aarch64,x86_64)
+  RTARGET := $(if $(findstring Aarch64,\
+                               $(subst ARM64,Aarch64,$(shell file "$(R_HOME_CROSS)/bin/R.exe"))),\
+                  aarch64,x86_64)
   R_ARCH_TARGET := $(shell $(FIND) $(R_HOME_CROSS)/bin -name $R.dll | $(SED) -e  's!.*/bin\(.*\)/R.dll!\1!g')
 endif
 

src/gnuwin32/installer/WiXins.R

@@ -64,7 +64,8 @@
         fout <- system(
                     paste("file", shQuote(file.path(srcdir, "bin", "R.exe"))),
                     intern=TRUE)
-        if (grepl("Aarch64", fout, fixed = TRUE))
+        if (grepl("Aarch64", fout, fixed = TRUE)
+            || grepl("ARM64", fout, fixed = TRUE))
             aarch64 <- TRUE
     }