diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
| commit | f26493b787d6cc057e9d8280d0b1d1ddfdcb9f1c (patch) | |
| tree | f1218f002f6246d18821d403145d4ed093559c02 /config.mak.uname | |
| parent | 8593e8a61807df2579b9e578d46e2285b47b61a7 (diff) | |
| parent | f0ec22bb70f66f92dda670a7ee0514b908f2237c (diff) | |
| download | git-f26493b787d6cc057e9d8280d0b1d1ddfdcb9f1c.tar.gz | |
Merge branch 'rs/bash-is-in-coreutils-on-nonstop'
* rs/bash-is-in-coreutils-on-nonstop:
config.mak.uname: move location of bash on NonStop to CoreUtils
Diffstat (limited to 'config.mak.uname')
| -rw-r--r-- | config.mak.uname | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname index 29ed39475f..b37fa8424c 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -510,9 +510,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL) # RFE 10-120912-4693 submitted to HP NonStop development. NO_SETITIMER = UnfortunatelyYes SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin - SHELL_PATH = /usr/local/bin/bash - # as of H06.25/J06.14, we might better use this - #SHELL_PATH = /usr/coreutils/bin/bash + SHELL_PATH = /usr/coreutils/bin/bash endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; |