From 914e435035c32edaa0b783ca2122eb3a3aaf329c Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Fri, 29 Mar 2019 03:31:06 -0700 Subject: [PATCH] Fix 32-bit holy-build-box builds Without this, `uname -m` could return x86_64 in a holy-build-box-32 image https://github.com/phusion/holy-build-box/blob/master/BUILDING-32-BIT-BINARIES.md --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ce196503..27f60c20 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ linux-build-box32-regular: luvi-src.tar.gz rm -rf build && mkdir -p build cp packaging/holy-build.sh luvi-src.tar.gz build docker run -t -i --rm \ - -v `pwd`/build:/io phusion/holy-build-box-32:latest bash /io/holy-build.sh regular-asm + -v `pwd`/build:/io phusion/holy-build-box-32:latest linux32 bash /io/holy-build.sh regular-asm mv build/luvi luvi-regular-Linux_i686 linux-build-box-tiny: luvi-src.tar.gz @@ -133,7 +133,7 @@ linux-build-box32-tiny: luvi-src.tar.gz rm -rf build && mkdir -p build cp packaging/holy-build.sh luvi-src.tar.gz build docker run -t -i --rm \ - -v `pwd`/build:/io phusion/holy-build-box-32:latest bash /io/holy-build.sh tiny + -v `pwd`/build:/io phusion/holy-build-box-32:latest linux32 bash /io/holy-build.sh tiny mv build/luvi luvi-tiny-Linux_i686 publish-src: reset luvi-src.tar.gz