GNUBoot/gnuboot
GNUBoot
/
gnuboot
mirror of https://git.savannah.gnu.org/git/gnuboot.git
2
1
Fork 0
Code Issues Releases Activity

Makefile: fix pipefail 

In the commit d68b4f8930 ("Makefile: Add
logging.") I forgot to add the SHELL := $(shell which bash) line that
is mentionned in the commit to the Makefile.

So now the Makefile targets are actually broken:
$ make release
    echo 'Makefile: running release target' >> make-1705163885.log
    set -o pipefail ; ./build release src | tee -a make-1705163885.log
    /bin/sh: 1: set: Illegal option -o pipefail
    make: *** [Makefile:59: release] Error 2

Since 'SHELL := bash' also works on PureOS 10 and Trisquel 10, I'll
use that instead as it is more simple.

The path of bash is not hardcoded to respect users decisions to use
the bash they want, and also to work better with non-FHS
distributions.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
Denis 'GNUtoo' Carikli 2024-01-13 19:15:59 +01:00 committed by Adrien 'neox' Bourmault
parent 526761153a
commit da06a2df88
Signed by: neox
GPG Key ID: 2974E1D5F25DFCC8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,7 +18,9 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# For making pipefail work.
SHELL := bash
.PHONY: all check download modules ich9m-descriptors payloads roms release \ .PHONY: all check download modules ich9m-descriptors payloads roms release \
clean crossgcc-clean install-dependencies-ubuntu \ clean crossgcc-clean install-dependencies-ubuntu \