From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2019 02:18:43 +0000 (-0800)
Subject: Merge branch 'rs/bash-is-in-coreutils-on-nonstop'
X-Git-Tag: v2.21.0-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f26493b787d6cc057e9d8280d0b1d1ddfdcb9f1c?ds=inline;hp=-c

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
---

f26493b787d6cc057e9d8280d0b1d1ddfdcb9f1c
diff --combined config.mak.uname
index 29ed39475f,75ff43f1f3..b37fa8424c
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -221,7 -221,6 +221,7 @@@ ifeq ($(uname_S),FreeBSD
  	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
  	PAGER_ENV = LESS=FRX LV=-c MORE=FRX
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 +	FILENO_IS_A_MACRO = UnfortunatelyYes
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -235,7 -234,6 +235,7 @@@
  	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
  	PROCFS_EXECUTABLE_PATH = /proc/curproc/file
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 +	FILENO_IS_A_MACRO = UnfortunatelyYes
  endif
  ifeq ($(uname_S),MirBSD)
  	NO_STRCASESTR = YesPlease
@@@ -510,9 -508,7 +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 = ;
@@@ -574,11 -570,9 +572,11 @@@ els
  		prefix = /usr/
  		ifeq (MINGW32,$(MSYSTEM))
  			prefix = /mingw32
 +			HOST_CPU = i686
  		endif
  		ifeq (MINGW64,$(MSYSTEM))
  			prefix = /mingw64
 +			HOST_CPU = x86_64
  		else
  			COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
  			BASIC_LDFLAGS += -Wl,--large-address-aware