rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files

[people/pmueller/ipfire-2.x.git] / lfs / rust-same-file

diff --git a/lfs/rust-same-file b/lfs/rust-same-file
index aa09b14ea4b8718f4402b89b57d449c3615d6b21..8cf29a34af477c0354f9b1e8882b8ed91e41e705 100644 (file)
--- a/lfs/rust-same-file
+++ b/lfs/rust-same-file
@@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-same-file-1.0.6-fix-metadata.patch
+
+       cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \
+               rm -f Cargo.toml.orig; \
+       fi; \
+
        cd $(DIR_APP) && $(CARGO_PREPARE)
        cd $(DIR_APP) && $(CARGO_BUILD)
        cd $(DIR_APP) && $(CARGO_INSTALL)