From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 4 Jul 2019 03:32:21 +0000 (-0700)
Subject: devops: New svm architectures svm1-{32,64}{b,l}e.
X-Git-Tag: mit-scheme-pucked-devops-0.12~2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=b6de4152d231ffd9e4d9071e523d8dba2b310d6c;p=mit-scheme.git

devops: New svm architectures svm1-{32,64}{b,l}e.
---

diff --git a/src/devops/build.scm b/src/devops/build.scm
index c3bc1f950..fc3ac6036 100644
--- a/src/devops/build.scm
+++ b/src/devops/build.scm
@@ -101,8 +101,8 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 (define (build-core-pkg name vers)
   (let ((sarch build-scheme-architecture)
 	(pkgdir (string build-dir"/"name"-"vers))
-	(options (if (string-prefix? "svm1" build-scheme-architecture)
-		     " --enable-native-code=svm1"
+	(options (if (string-prefix? "svm" build-scheme-architecture)
+		     (string " --enable-native-code="build-scheme-architecture)
 		     "")))
     (run "rm -rf "pkgdir)
     (run "cd "build-dir" && tar xzf "name"-"vers".tar.gz")
diff --git a/src/devops/devops.scm b/src/devops/devops.scm
index a213315c8..bdaeca45b 100644
--- a/src/devops/devops.scm
+++ b/src/devops/devops.scm
@@ -1105,8 +1105,10 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
   (let ((arch (host-scheme-architecture host)))
     (cond ((string=? "x86-64" arch) "amd64")
 	  ((string=? "i386" arch) "i386")
-	  ((string=? "svm1-32" arch) #f)
-	  ((string=? "svm1-64" arch) #f)
+	  ((string=? "svm1-32le" arch) #f)
+	  ((string=? "svm1-32be" arch) #f)
+	  ((string=? "svm1-64le" arch) #f)
+	  ((string=? "svm1-64be" arch) #f)
 	  (else (error "Unknown host architecture:" arch)))))
 
 (define (host-ubuntu-codename host)