diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-06-17 17:22:02 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-06-17 17:32:11 -0700 |
| commit | 2e63604e2aef8aacff2591266933393ce0f41b13 (patch) | |
| tree | e0c2ddff5d74c133162c08a824323e04ba1235e6 | |
| parent | 8af39cebc547a946b4ae861854c46c9c9a70a923 (diff) | |
| download | rust-2e63604e2aef8aacff2591266933393ce0f41b13.tar.gz rust-2e63604e2aef8aacff2591266933393ce0f41b13.zip | |
mk: Fix reconfiguring top-level ./configure
In #26252 support was added to have prettier paths printed out on failure by not passing the full path to the source file to the compiler, but instead just a small relative path. To preserve this relative path across configurations, the `SREL` variable was used for reconfiguring, but if `SREL` is empty then it will attempt to run the command `configure` which is distinct from running `./configure` (e.g. doesn't run the local script). This commit modifies the `SREL` value to re-run the configure script by setting it to `./` in the case where `SREL` is empty.
| -rw-r--r-- | mk/reconfig.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/reconfig.mk b/mk/reconfig.mk index ea9039558ad..1a3a1774384 100644 --- a/mk/reconfig.mk +++ b/mk/reconfig.mk @@ -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) - $(SREL)configure $(CFG_CONFIGURE_ARGS) + $(SREL_ROOT)configure $(CFG_CONFIGURE_ARGS) |