Skip to content

Commit 97fe8e9

Browse files
committed
apply tweaks for emscripten on new rust nightly
1 parent ad6b6ad commit 97fe8e9

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches:
55
- main
6-
- emscripten-ci2
76
pull_request:
87

98
concurrency:

noxfile.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import nox
99

10+
import nox
11+
1012

1113
@nox.session(name="test-examples", venv_backend="none")
1214
def test_examples(session: nox.Session):
@@ -99,23 +101,14 @@ def test_examples_emscripten(session: nox.Session):
99101
env = os.environ.copy()
100102
env.update(
101103
RUSTUP_TOOLCHAIN="nightly",
102-
_SETUPTOOLSRUST_BUILD_STD="1",
103104
PYTHONPATH=str(emscripten_dir),
104105
_PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata__emscripten_wasm32-emscripten",
105106
_PYTHON_HOST_PLATFORM="emscripten_3_1_14_wasm32",
106107
CARGO_BUILD_TARGET="wasm32-unknown-emscripten",
107-
CARGO_UNSTABLE_BUILD_STD="true",
108108
CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_LINKER=str(
109109
emscripten_dir / "emcc_wrapper.py"
110110
),
111111
PYO3_CONFIG_FILE=str(emscripten_dir / "pyo3_config.ini"),
112-
RUSTFLAGS=" ".join(
113-
[
114-
"-C relocation-model=pic",
115-
"-C link-arg=-sSIDE_MODULE=2",
116-
"-C link-arg=-sWASM_BIGINT",
117-
]
118-
),
119112
)
120113
with session.chdir(example):
121114
session.run("python", "setup.py", "bdist_wheel", env=env, external=True)

0 commit comments

Comments
 (0)