mirror of
https://github.com/bensuperpc/dockcross.git
synced 2026-07-26 04:48:08 +02:00
Remove copy_libstd.sh workaround from manylinux_2_34-aarch64
The libstdc++ copy trick is no longer needed, as noted in PR #931 which removed it for manylinux2014-aarch64.
This commit is contained in:
@@ -209,10 +209,6 @@ manylinux_2_28-aarch64.test: manylinux_2_28-aarch64
|
||||
# manylinux_2_34-aarch64
|
||||
#
|
||||
manylinux_2_34-aarch64: manylinux_2_34-aarch64/Dockerfile manylinux_2_34-x64
|
||||
@# Register qemu
|
||||
docker run --rm --privileged hypriot/qemu-register
|
||||
@# Get libstdc++ from quay.io/pypa/manylinux_2_34_aarch64 container
|
||||
docker run -v `pwd`:/host --rm -e LIB_PATH=/host/$@/xc_script/ quay.io/pypa/manylinux_2_34_aarch64 bash -c "PASS=1 /host/$@/xc_script/docker_setup_scripts/copy_libstd.sh"
|
||||
mkdir -p $@/imagefiles && cp -r imagefiles $@/
|
||||
$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux_2_34-aarch64:$(TAG) \
|
||||
$(TAG_FLAG) $(ORG)/manylinux_2_34-aarch64:latest \
|
||||
@@ -223,8 +219,6 @@ manylinux_2_34-aarch64: manylinux_2_34-aarch64/Dockerfile manylinux_2_34-x64
|
||||
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
|
||||
-f manylinux_2_34-aarch64/Dockerfile .
|
||||
rm -rf $@/imagefiles
|
||||
@# libstdc++ is copied into image, now remove it
|
||||
docker run -v `pwd`:/host --rm quay.io/pypa/manylinux_2_34_aarch64 bash -c "rm -rf /host/$@/xc_script/usr"
|
||||
|
||||
manylinux_2_34-aarch64.test: manylinux_2_34-aarch64
|
||||
$(TEST_DOCKER) run $(RM) $(ORG)/manylinux_2_34-aarch64:latest > $(BIN)/dockcross-manylinux_2_34-aarch64 \
|
||||
|
||||
Reference in New Issue
Block a user