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
This commit is contained in:
Junio C Hamano 2017-11-22 14:57:52 +09:00
commit da10ea373b

View File

@ -254,7 +254,7 @@ $(ALL_MSGFILES): %.msg : %.po
lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
$(QUIET_INDEX)if echo \ $(QUIET_INDEX)if echo \
$(foreach p,$(PRELOAD_FILES),source $p\;) \ $(foreach p,$(PRELOAD_FILES),source $p\;) \
auto_mkindex lib '*.tcl' \ auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \ | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
else \ else \
echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \ echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \