Skip to content

Commit 9ad0063

Browse files
committed
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.
2 parents cca2817 + 2e63604 commit 9ad0063

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

mk/reconfig.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ endif
3232

3333
Makefile config.mk: config.stamp
3434

35+
ifeq ($(SREL),)
36+
SREL_ROOT := ./
37+
else
38+
SREL_ROOT := $(SREL)
39+
endif
40+
3541
config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
3642
@$(call E, cfg: reconfiguring)
37-
$(SREL)configure $(CFG_CONFIGURE_ARGS)
43+
$(SREL_ROOT)configure $(CFG_CONFIGURE_ARGS)

0 commit comments

Comments
 (0)