Skip to content

Commit bc9f16c

Browse files
committed
configure: Remove obsolete --disable-verify option
rust-installer never verifies.
1 parent 45eb54c commit bc9f16c

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
540540
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
541541
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
542542
opt rpath 0 "build rpaths into rustc itself"
543-
opt verify-install 1 "verify installed binaries work"
544543
# This is used by the automation to produce single-target nightlies
545544
opt dist-host-only 0 "only install bins for the host architecture"
546545
opt inject-std-version 1 "inject the current compiler version of libstd into programs"

mk/install.mk

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
# option. This file may not be copied, modified, or distributed
99
# except according to those terms.
1010

11-
ifdef CFG_DISABLE_VERIFY_INSTALL
12-
MAYBE_DISABLE_VERIFY=--disable-verify
13-
else
14-
MAYBE_DISABLE_VERIFY=
15-
endif
16-
1711
install:
1812
ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
1913
# Build the dist as the original user
@@ -22,9 +16,9 @@ else
2216
$(Q)$(MAKE) prepare_install
2317
endif
2418
ifeq ($(CFG_DISABLE_DOCS),)
25-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
19+
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2620
endif
27-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
21+
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2822
# Remove tmp files because it's a decent amount of disk space
2923
$(Q)rm -R tmp/dist
3024

0 commit comments

Comments
 (0)