Bensuperpc/dockcross
1
0 Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2026-10-09 20:12:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

manylinux: Consolidate common content into common.manylinux

Browse Source
This commit is contained in:
Matt McCormick authored and Jean-Christophe Fillion-Robin committed 2016-11-03 21:50:41 -04:00
1 parent d41d7f919e
commit 26c5447d29
4 files changed
+16 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+4 -4
View File
@@ -56,8 +56,8 @@ browser-asmjs.test: browser-asmjs
#
# manylinux-x64
#
manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker
sed '/common.docker/ r common.docker' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker common.manylinux
sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
manylinux-x64: manylinux-x64/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x64 \
@@ -74,8 +74,8 @@ manylinux-x64.test: manylinux-x64
#
# manylinux-x86
#
manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker
sed '/common.docker/ r common.docker' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker common.manylinux
sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
manylinux-x86: manylinux-x86/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x86 \