Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAINT Remove custom setuptools_rust commit (#3045)

This commit is contained in:
Hood Chatham 2022-08-30 17:29:25 -07:00 committed by GitHub
parent 1d2f9bff7a
commit e6e7d56752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -189,15 +189,10 @@ emsdk/emsdk/.complete:
date +"[%F %T] done building emsdk." date +"[%F %T] done building emsdk."
SETUPTOOLS_RUST_COMMIT=5e8c380429aba1e5df5815dcf921025c599cecec
rust: rust:
wget -q -O - https://sh.rustup.rs | sh -s -- -y wget -q -O - https://sh.rustup.rs | sh -s -- -y
source $(HOME)/.cargo/env && rustup toolchain install $(RUST_TOOLCHAIN) && rustup default $(RUST_TOOLCHAIN) source $(HOME)/.cargo/env && rustup toolchain install $(RUST_TOOLCHAIN) && rustup default $(RUST_TOOLCHAIN)
source $(HOME)/.cargo/env && rustup target add wasm32-unknown-emscripten --toolchain $(RUST_TOOLCHAIN) source $(HOME)/.cargo/env && rustup target add wasm32-unknown-emscripten --toolchain $(RUST_TOOLCHAIN)
# Install setuptools-rust with a fix for Wasm targets
# TODO: Remove this when they release the next version.
pip install -t $(HOSTSITEPACKAGES) git+https://github.com/PyO3/setuptools-rust.git@$(SETUPTOOLS_RUST_COMMIT)
FORCE: FORCE:

2
pyodide-build/pyodide_build/common.py
View File

@ -295,8 +295,6 @@ def get_unisolated_packages() -> list[str]:
config = parse_package_config(pkg, check=False) config = parse_package_config(pkg, check=False)
if config.get("build", {}).get("cross-build-env", False): if config.get("build", {}).get("cross-build-env", False):
unisolated_packages.append(config["package"]["name"]) unisolated_packages.append(config["package"]["name"])
# TODO: remove setuptools_rust from this when they release the next version.
unisolated_packages.append("setuptools_rust")
os.environ["UNISOLATED_PACKAGES"] = json.dumps(unisolated_packages) os.environ["UNISOLATED_PACKAGES"] = json.dumps(unisolated_packages)
return unisolated_packages return unisolated_packages