From 8906a22f52b22f517c45773e1c5cbf7959d058b2 Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Wed, 6 Jan 2021 00:42:56 -0800
Subject: [PATCH] pip makes few ordering guarantees

---
 Dockerfile | 2 +-
 Makefile   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3de11f2..89f3741 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ RUN true \
     && apt-get install --no-install-recommends -y \
          build-essential=12.6                     \
          patchelf=0.9*                            \
+    && pip3 install scons==4.0.1                  \
     && pip3 install pyinstaller==4.1              \
-                    scons==4.0.1                  \
                     patchelf-wrapper==1.2.0       \
                     staticx==0.12.0               \
     && rm -rf /var/lib/apt/lists/*
diff --git a/Makefile b/Makefile
index 88c322f..1323a23 100755
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,7 @@ SRC_DIRS := cmd pkg # directories which hold app source (not vendored)
 # Windows not working atm
 #ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x
 # Unlikely I'll run on ppc or s390x anytime soon
-#
-# Something is up with scons on platforms outside amd64
-# ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64
-ALL_PLATFORMS := linux/amd64
+ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64
 
 # Used internally.  Users should pass BUILDOS and/or BUILDARCH.
 # guess if go isn't installed on the host