Auto merge of #28101 - ijks:24214-str-bytes, r=alexcrichton

[rust.git] / mk / reconfig.mk

diff --git a/mk/reconfig.mk b/mk/reconfig.mk
index fc8237d32bb3e1442f3563b7ce5658739971696c..1a3a1774384d84d897675c9f67a4ee797b3927fa 100644 (file)
--- a/mk/reconfig.mk
+++ b/mk/reconfig.mk
@@ -16,10 +16,10 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \
 ifndef CFG_DISABLE_MANAGE_SUBMODULES
 # This is a pretty expensive operation but I don't see any way to avoid it
 # NB: This only looks for '+' status (wrong commit checked out), not '-' status
-# (nothing checked out at all).  `./configure --{llvm,jemalloc,libuv}-root`
+# (nothing checked out at all).  `./configure --{llvm,jemalloc}-root`
 # will explicitly deinitialize the corresponding submodules, and we don't
 # want to force constant rebuilds in that case.
-NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+')
+NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && $(CFG_GIT) submodule status | grep -c '^+')
 else
 NEED_GIT_RECONFIG=0
 endif
@@ -32,6 +32,12 @@ endif
 
 Makefile config.mk: config.stamp
 
+ifeq ($(SREL),)
+SREL_ROOT := ./
+else
+SREL_ROOT := $(SREL)
+endif
+
 config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
        @$(call E, cfg: reconfiguring)
-       $(S)configure $(CFG_CONFIGURE_ARGS)
+       $(SREL_ROOT)configure $(CFG_CONFIGURE_ARGS)