[nongnu] elpa/emacsql 801bc6239f 222/427: Swap the tuple order.

[ELPA Syncer]

branch: elpa/emacsql
commit 801bc6239f1f02443a20577d288559906b67ff90
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>

    Swap the tuple order.
---
 emacsql-system.el |  4 ++--
 sqlite/Makefile   | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/emacsql-system.el b/emacsql-system.el
index 2ac8bfcc21..01d77210ef 100644
--- a/emacsql-system.el
+++ b/emacsql-system.el
@@ -25,6 +25,7 @@
 (defun emacsql-system-tuple ()
   "Return a tuple (kernel architecture) for the current system."
   (list
+   (emacsql-system-architecture)
    (cl-ecase system-type
      (gnu 'hurd)
      (gnu/linux 'linux)
@@ -32,8 +33,7 @@
      (darwin 'darwin)
      (ms-dos 'dos)
      (windows-nt 'windows)
-     (cygwin 'windows))
-   (emacsql-system-architecture)))
+     (cygwin 'windows))))
 
 (defun emacsql-system-binary (prefix)
   "Determine an executable name for PREFIX."
diff --git a/sqlite/Makefile b/sqlite/Makefile
index 4e47907d27..c8e34aea94 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -1,10 +1,12 @@
 ifeq ($(OS),Windows_NT)
-    OSTUPLE = windows-x86
+    OSTUPLE = x86-windows
     BINARY  = emacsql-sqlite-$(OSTUPLE).exe
 else
-    OSTUPLE = $(shell uname -sm | tr '[A-Z]' '[a-z]' | tr ' ' '-')
-    BINARY  = emacsql-sqlite-$(OSTUPLE)
-    LDLIBS  = -ldl
+    PART_ARCH = $(shell uname -m)
+    PART_OS   = $(shell uname -ms | tr '[A-Z]' '[a-z]')
+    OSTUPLE   = $(PART_ARCH)-$(PART_OS)
+    BINARY    = emacsql-sqlite-$(OSTUPLE)
+    LDLIBS    = -ldl
 endif
 
 CFLAGS  = -O2 --std=c99 -W -Wall -Wextra