From d059185badb3203d35eee0f70c48b85bf278fb57 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 10 Jul 2019 14:38:55 -0400
Subject: [PATCH] Revert "Revert "systems/doubles.nix: add Apple doubles""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit ce2f74df2cade57e74c235292c8b074281903e71.
Doubles are treated as -darwin here, to provide some consistency.
There is some ambiguity between “x86_64-darwin” and “i686-darwin”
which could refer to binaries linked between iOS simulator or real
macOS binaries. useiOSPrebuilt can be used to determine which to use,
however.
---
lib/systems/doubles.nix | 4 +++-
lib/tests/systems.nix | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 09e9089aa6fd..f096a0b17fc6 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -13,9 +13,11 @@ let
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
- "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
+ "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
+
"x86_64-windows" "i686-windows"
"wasm64-wasi" "wasm32-wasi"
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 7fc4b2eabcfd..5748c09b564d 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -14,13 +14,13 @@ let
in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
- testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" ];
- testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" ];
+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
+ testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mipsel-linux" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
- testdarwin = mseteq darwin [ "x86_64-darwin" ];
+ testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];
testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];