Skip to content

Commit

Permalink
Fix 32-bit holy-build-box builds
Browse files Browse the repository at this point in the history
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
  • Loading branch information
squeek502 committed Mar 29, 2019
1 parent 63b866b commit 914e435
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 914e435

Please sign in to comment.