summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-22 14:57:52 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-22 14:57:52 +0900
commitda10ea373b80cc8bf8efca5acb1d11ecf410fb0c (patch)
treecacf67aedbd9afcf2e2c1554ffb6f0d8c099efd4
parentgenerate-cmdlist: avoid non-deterministic output (diff)
parentgit-gui: sort entries in optimized tclIndex (diff)
downloadtgif-da10ea373b80cc8bf8efca5acb1d11ecf410fb0c.tar.xz
Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build
* 'jn/reproducible-build' of ../git-gui: git-gui: sort entries in optimized tclIndex
-rw-r--r--git-gui/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 918a8de369..f10caedaa7 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -254,7 +254,7 @@ $(ALL_MSGFILES): %.msg : %.po
lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
$(QUIET_INDEX)if echo \
$(foreach p,$(PRELOAD_FILES),source $p\;) \
- auto_mkindex lib '*.tcl' \
+ auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
else \
echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \