sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove useless makefile target

Browse source
This commit is contained in:
Markus Unterwaditzer 2018-03-16 18:27:02 +01:00
parent 50c1151921
commit 168d999359
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -149,10 +149,6 @@ install-rust:
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
rustup update nightly rustup update nightly
rust-ext:
[ "$$READTHEDOCS" != "True" ] || $(MAKE) install-rust
cd ./rust && cargo build --release
rust/vdirsyncer_rustext.h: rust/vdirsyncer_rustext.h:
cbindgen -c rust/cbindgen.toml rust/ > $@ cbindgen -c rust/cbindgen.toml rust/ > $@

8
setup.py
View file

@ -43,14 +43,14 @@ requirements = [
def build_native(spec): def build_native(spec):
build = spec.add_external_build( build = spec.add_external_build(
cmd=['make', 'rust-ext'], cmd=['cargo', 'build', '--release'],
path='.' path='./rust/'
) )
spec.add_cffi_module( spec.add_cffi_module(
module_path='vdirsyncer._native', module_path='vdirsyncer._native',
dylib=lambda: build.find_dylib( dylib=lambda: build.find_dylib('vdirsyncer_rustext',
'vdirsyncer_rustext', in_path='rust/target/release'), in_path='target/release'),
header_filename='rust/vdirsyncer_rustext.h', header_filename='rust/vdirsyncer_rustext.h',
# Rust bug: If thread-local storage is used, this flag is necessary # Rust bug: If thread-local storage is used, this flag is necessary
# (mitsuhiko) # (mitsuhiko)