diff --git a/recipe/install-rust.sh b/recipe/install-rust.sh index b566bd4..cfad682 100755 --- a/recipe/install-rust.sh +++ b/recipe/install-rust.sh @@ -16,6 +16,11 @@ rm -rf "${PREFIX}"/share/doc/rust/json rm -f "${PREFIX}"/lib/rustlib/manifest-rust-docs rm -f "${PREFIX}"/lib/rustlib/manifest-rust-docs-json-preview +# Remove rust-analyzer - it is not needed for standard Rust compilation +rm -f "${PREFIX}"/bin/rust-analyzer +rm -f "${PREFIX}"/bin/rust-analyzer.pdb +rm -f "${PREFIX}"/lib/rustlib/manifest-rust-analyzer + # Fun times -- by default, Rust/Cargo tries to link executables on Linux by # invoking `cc`. An executable of this name is not necessarily available. By # setting a magic environment variable, we can override this default. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b485395..e685919 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ source: folder: rust-std # [(linux or win) and x86_64] build: - number: 0 + number: 1 requirements: build: @@ -154,6 +154,10 @@ outputs: - test ! -d "${PREFIX}"/share/doc/rust/json # [unix] - if exist %LIBRARY_PREFIX%\share\doc\rust\html exit 1 # [win] - if exist %LIBRARY_PREFIX%\share\doc\rust\json exit 1 # [win] + # rust-analyzer should not be in the rust package + - test ! -f "${PREFIX}"/bin/rust-analyzer # [unix] + - if exist %LIBRARY_PREFIX%\bin\rust-analyzer.exe exit 1 # [win] + - if exist %LIBRARY_PREFIX%\bin\rust-analyzer.pdb exit 1 # [win] - name: rust-src script: install-rust-src.sh # [unix]