diff options
| author | bors <bors@rust-lang.org> | 2015-06-20 23:09:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-20 23:09:55 +0000 |
| commit | 9ad0063a1772edca3299e2dc76187bbfa74e8b16 (patch) | |
| tree | 9cee2d7c85db113e5526c77018c1944aacb94c09 | |
| parent | cca281781f94f5bfbe652b8b3499b322a575258b (diff) | |
| parent | 2e63604e2aef8aacff2591266933393ce0f41b13 (diff) | |
| download | rust-9ad0063a1772edca3299e2dc76187bbfa74e8b16.tar.gz rust-9ad0063a1772edca3299e2dc76187bbfa74e8b16.zip | |
Auto merge of #26381 - alexcrichton:fix-srel, r=brson
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) |