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 /Makefile.in | |
| 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>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 1 insertions, 4 deletions
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),) |