X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config.mak.uname;h=b37fa8424c88cae23abf02f8276e8b4f6ffef19a;hb=7af01f23678dbaeed37773e37737f2ef3db1cb49;hp=bd55e828cabd2a4b17ebf8a8735027c5c8d950f7;hpb=feb9a9b202c12289150de45473846f4272aac1bd;p=thirdparty%2Fgit.git diff --git a/config.mak.uname b/config.mak.uname index bd55e828ca..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 = ; @@ -574,9 +572,11 @@ else 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