diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 11:30:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 10:07:40 +0000 |
commit | 5067d31364695d892d4290afb039a9877450fccb (patch) | |
tree | 6d82a3a28ed5fe1fd91be1d8b06c3feb18a37341 | |
parent | 313b82d330b5814326fb1fbb930fb09475313d85 (diff) |
Remove setting Make SHELL completely from the build system
...this is a follow-up to efad388f756014a7df5ed6f8e4ce417d24e9aba9 "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 815f157c05ebc20e91a050823f048a977b8ae103 "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>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.in | 5 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | solenv/gbuild/partial_build.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/shell.mk.in | 12 |
5 files changed, 1 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore index 544024db6f6f..ec3a2fe8c1af 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,6 @@ /config_build_lang.mk /configure /lo.xcent -/solenv/gbuild/shell.mk /Makefile /NEWS /TODO diff --git a/Makefile.in b/Makefile.in index 4a065ff7924c..bf8d79845f43 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,8 +21,6 @@ SRCDIR := @SRC_ROOT@ BUILDDIR := @BUILDDIR@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T) -include $(SRCDIR)/solenv/gbuild/shell.mk - # Run autogen.sh if needed and force make to restart itself. # ... but there are several cases where we do not want to run # autogen.sh: @@ -45,7 +43,6 @@ $(BUILDDIR)/config_host.mk : $(wildcard \ $(SRCDIR)/configure.ac \ $(SRCDIR)/config_host/*.h.in \ $(SRCDIR)/android/source/AndroidManifest.xml.in \ - $(SRCDIR)/solenv/gbuild/shell.mk.in \ $(BUILDDIR)/autogen.input \ $(BUILDDIR)/autogen.lastrun \ $(BUILDDIR)/autogen.sh \ @@ -60,7 +57,7 @@ gb_Side ?= host 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),) diff --git a/configure.ac b/configure.ac index 8ab6089f7a93..e650e71531fc 100644 --- a/configure.ac +++ b/configure.ac @@ -4519,7 +4519,6 @@ if test "$cross_compiling" = "yes"; then lo.xcent.in \ instsetoo_native/util/openoffice.lst.in \ config_host/*.in \ - solenv/gbuild/shell.mk.in \ sysui/desktop/macosx/Info.plist.in \ ios/lo.xcconfig.in) \ | (cd CONF-FOR-BUILD && tar xf -) @@ -4957,15 +4956,6 @@ if test "$_make_ver_check" = ""; then STALE_MAKE=TRUE 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 WITH_LINKER_HASH_STYLE= AC_MSG_CHECKING( for --hash-style gcc linker support ) @@ -12998,7 +12988,6 @@ AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst - solenv/gbuild/shell.mk sysui/desktop/macosx/Info.plist ios/lo.xcconfig]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index e8413246bd1a..3b4478f23154 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -32,8 +32,6 @@ ifeq ($(BUILD_TYPE),) include $(BUILDDIR)/config_$(gb_Side).mk endif -include $(SRCDIR)/solenv/gbuild/shell.mk - gb_PARTIAL_BUILD := T include $(SRCDIR)/solenv/gbuild/gbuild.mk diff --git a/solenv/gbuild/shell.mk.in b/solenv/gbuild/shell.mk.in deleted file mode 100644 index d5a92528e522..000000000000 --- a/solenv/gbuild/shell.mk.in +++ /dev/null @@ -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: |