diff --git a/Makefile b/Makefile index 1f7aee0..a7ad5ea 100644 --- a/Makefile +++ b/Makefile @@ -149,10 +149,6 @@ install-rust: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly rustup update nightly -rust-ext: - [ "$$READTHEDOCS" != "True" ] || $(MAKE) install-rust - cd ./rust && cargo build --release - rust/vdirsyncer_rustext.h: cbindgen -c rust/cbindgen.toml rust/ > $@ diff --git a/setup.py b/setup.py index bea282b..4bae546 100644 --- a/setup.py +++ b/setup.py @@ -43,14 +43,14 @@ requirements = [ def build_native(spec): build = spec.add_external_build( - cmd=['make', 'rust-ext'], - path='.' + cmd=['cargo', 'build', '--release'], + path='./rust/' ) spec.add_cffi_module( module_path='vdirsyncer._native', - dylib=lambda: build.find_dylib( - 'vdirsyncer_rustext', in_path='rust/target/release'), + dylib=lambda: build.find_dylib('vdirsyncer_rustext', + in_path='target/release'), header_filename='rust/vdirsyncer_rustext.h', # Rust bug: If thread-local storage is used, this flag is necessary # (mitsuhiko)