Remove setting Make SHELL completely from the build system

...this is a follow-up to efad388f75 "Clean up
Make SHELL handling," which broke out-of-tree builds.

There appears to be no good reason at all to fiddle with Make's own behavior of
determining its SHELL variable (which defaults to /bin/sh and can be overridden
via a SHELL=... command line argument when invoking Make).  The SHELL_BASH
fiddling in configure.ac and Makefile.in was probably cargo cult carried along
ever since 815f157c05 "CWS-TOOLING: integrate CWS
configuretoplevel," in a time when the OOo build system still defaulted to tcsh.

Change-Id: If906164abb6aae649ce8088d945a40213deed361
Reviewed-on: https://gerrit.libreoffice.org/19093
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2015-10-02 11:30:40 +02:00
parent 313b82d330
commit 5067d31364
5 changed files with 1 additions and 30 deletions

1
.gitignore vendored
View file

@ -53,7 +53,6 @@
/config_build_lang.mk /config_build_lang.mk
/configure /configure
/lo.xcent /lo.xcent
/solenv/gbuild/shell.mk
/Makefile /Makefile
/NEWS /NEWS
/TODO /TODO

View file

@ -21,8 +21,6 @@ SRCDIR := @SRC_ROOT@
BUILDDIR := @BUILDDIR@ BUILDDIR := @BUILDDIR@
GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T) GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
include $(SRCDIR)/solenv/gbuild/shell.mk
# Run autogen.sh if needed and force make to restart itself. # Run autogen.sh if needed and force make to restart itself.
# ... but there are several cases where we do not want to run # ... but there are several cases where we do not want to run
# autogen.sh: # autogen.sh:
@ -45,7 +43,6 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/configure.ac \ $(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \ $(SRCDIR)/config_host/*.h.in \
$(SRCDIR)/android/source/AndroidManifest.xml.in \ $(SRCDIR)/android/source/AndroidManifest.xml.in \
$(SRCDIR)/solenv/gbuild/shell.mk.in \
$(BUILDDIR)/autogen.input \ $(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \ $(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \ $(BUILDDIR)/autogen.sh \
@ -60,7 +57,7 @@ gb_Side ?= host
include $(BUILDDIR)/config_$(gb_Side).mk include $(BUILDDIR)/config_$(gb_Side).mk
export GMAKE_OPTIONS?=-r$(if $(verbose),,s)$(value $(MAKEFLAGS)) SHELL=$(SHELL) export GMAKE_OPTIONS?=-r$(if $(verbose),,s)$(value $(MAKEFLAGS))
PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j $(PARALLELISM),) PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j $(PARALLELISM),)

View file

@ -4519,7 +4519,6 @@ if test "$cross_compiling" = "yes"; then
lo.xcent.in \ lo.xcent.in \
instsetoo_native/util/openoffice.lst.in \ instsetoo_native/util/openoffice.lst.in \
config_host/*.in \ config_host/*.in \
solenv/gbuild/shell.mk.in \
sysui/desktop/macosx/Info.plist.in \ sysui/desktop/macosx/Info.plist.in \
ios/lo.xcconfig.in) \ ios/lo.xcconfig.in) \
| (cd CONF-FOR-BUILD && tar xf -) | (cd CONF-FOR-BUILD && tar xf -)
@ -4957,15 +4956,6 @@ if test "$_make_ver_check" = ""; then
STALE_MAKE=TRUE STALE_MAKE=TRUE
fi fi
if test -z "$SHELL_BASH"; then
if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
SHELL_BASH=$(cygpath -m $(which bash))
else
SHELL_BASH=`which bash`
fi
fi
AC_SUBST(SHELL_BASH)
HAVE_LD_HASH_STYLE=FALSE HAVE_LD_HASH_STYLE=FALSE
WITH_LINKER_HASH_STYLE= WITH_LINKER_HASH_STYLE=
AC_MSG_CHECKING( for --hash-style gcc linker support ) AC_MSG_CHECKING( for --hash-style gcc linker support )
@ -12998,7 +12988,6 @@ AC_CONFIG_FILES([config_host.mk
Makefile Makefile
lo.xcent lo.xcent
instsetoo_native/util/openoffice.lst instsetoo_native/util/openoffice.lst
solenv/gbuild/shell.mk
sysui/desktop/macosx/Info.plist sysui/desktop/macosx/Info.plist
ios/lo.xcconfig]) ios/lo.xcconfig])
AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_buildid.h])

View file

@ -32,8 +32,6 @@ ifeq ($(BUILD_TYPE),)
include $(BUILDDIR)/config_$(gb_Side).mk include $(BUILDDIR)/config_$(gb_Side).mk
endif endif
include $(SRCDIR)/solenv/gbuild/shell.mk
gb_PARTIAL_BUILD := T gb_PARTIAL_BUILD := T
include $(SRCDIR)/solenv/gbuild/gbuild.mk include $(SRCDIR)/solenv/gbuild/gbuild.mk

View file

@ -1,12 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
export SHELL := @SHELL_BASH@
# vim: set noet sw=4 ts=4: