Skip to content

select correct musl toolchain for static build #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jjhelmus wants to merge 1 commit into from
+5 −3
Open

select correct musl toolchain for static build #1212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cpython-unix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ PYTHON_MAJOR_VERSION := $(subst $(SPACE),.,$(wordlist 1,2,$(subst .,$(SPACE),$(P
TARGET_TRIPLE := $(PYBUILD_TARGET_TRIPLE)
HOST_PLATFORM := $(PYBUILD_HOST_PLATFORM)
PACKAGE_SUFFIX := $(TARGET_TRIPLE)-$(PYBUILD_BUILD_OPTIONS)
MUSL_TOOLCHAIN_NAME := $(if $(findstring static,$(PYBUILD_BUILD_OPTIONS)),musl-static,musl)
MUSL_TOOLCHAIN_VERSION = $(if $(findstring static,$(PYBUILD_BUILD_OPTIONS)),$(MUSL_STATIC_VERSION),$(MUSL_VERSION))

RUN_BUILD = $(BUILD) \
--host-platform $(HOST_PLATFORM) \
Expand Down Expand Up @@ -61,7 +63,7 @@ BASE_TOOLCHAIN_DEPENDS := \

TOOLCHAIN_DEPENDS := \
$(BASE_TOOLCHAIN_DEPENDS) \
$(if $(NEED_MUSL),$(OUTDIR)/musl-$(MUSL_VERSION)-$(HOST_PLATFORM).tar) \
$(if $(NEED_MUSL),$(OUTDIR)/$(MUSL_TOOLCHAIN_NAME)-$(MUSL_TOOLCHAIN_VERSION)-$(HOST_PLATFORM).tar) \
$(NULL)

PYTHON_DEP_DEPENDS := \
Expand All @@ -85,11 +87,11 @@ $(OUTDIR)/binutils-$(BINUTILS_VERSION)-$(HOST_PLATFORM).tar: $(OUTDIR)/image-$(D
$(OUTDIR)/$(CLANG_FILENAME):
$(RUN_BUILD) --toolchain clang --target-triple $(TARGET_TRIPLE)

$(OUTDIR)/musl-$(MUSL_VERSION)-$(HOST_PLATFORM).tar: $(BASE_TOOLCHAIN_DEPENDS) $(HERE)/build-musl.sh
$(OUTDIR)/$(MUSL_TOOLCHAIN_NAME)-$(MUSL_TOOLCHAIN_VERSION)-$(HOST_PLATFORM).tar: $(BASE_TOOLCHAIN_DEPENDS) $(HERE)/build-musl.sh
$(RUN_BUILD) --toolchain musl --docker-image $(DOCKER_IMAGE_GCC)

ifeq ($(HOST_PLATFORM),linux_x86_64)
TOOLCHAIN_TARGET := $(OUTDIR)/musl-$(MUSL_VERSION)-$(HOST_PLATFORM).tar
TOOLCHAIN_TARGET := $(OUTDIR)/$(MUSL_TOOLCHAIN_NAME)-$(MUSL_TOOLCHAIN_VERSION)-$(HOST_PLATFORM).tar
else
TOOLCHAIN_TARGET :=
endif
Expand Down
Loading