From 5067d31364695d892d4290afb039a9877450fccb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 2 Oct 2015 11:30:40 +0200 Subject: 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 Tested-by: Stephan Bergmann --- solenv/gbuild/partial_build.mk | 2 -- solenv/gbuild/shell.mk.in | 12 ------------ 2 files changed, 14 deletions(-) delete mode 100644 solenv/gbuild/shell.mk.in (limited to 'solenv') 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: -- cgit