devops: New svm architectures svm1-{32,64}{b,l}e.
authorMatt Birkholz <matt@birchwood-abbey.net>
Thu, 4 Jul 2019 03:32:21 +0000 (20:32 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Thu, 4 Jul 2019 03:32:21 +0000 (20:32 -0700)
src/devops/build.scm
src/devops/devops.scm

index c3bc1f950407efae45fb61cbd6bf37192f32b12c..fc3ac603603b90599e2314d2132a3fcf56f7adf9 100644 (file)
@@ -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")
index a213315c866519dfe15bdca7f5cf886979281fb6..bdaeca45b899b5a8c8f1ef61bd90e581babb4b8e 100644 (file)
@@ -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)