From 916e8485b1e2be0343224232da1eec1f2f5ea26b Mon Sep 17 00:00:00 2001 From: Niklas Sombert Date: Fri, 22 Dec 2023 17:41:22 +0100 Subject: [PATCH] Don't hardcode the path for bash Some systems (eg. NixOS) don't have it in /bin. --- Makefile | 2 +- cfg/Config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6d1d219f1..1cf747dffd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ### This makefile is the top-level build script that builds all the crates in subdirectories ### and combines them into the final OS .iso image. ### It also provides convenient targets for running and debugging Theseus and using GDB on your host computer. -SHELL := /bin/bash +SHELL := /usr/bin/env bash ## Disable parallelism for this Makefile since it breaks the build, ## as our dependencies aren't perfectly specified for each target. diff --git a/cfg/Config.mk b/cfg/Config.mk index f01a672d54..eee4008f1b 100644 --- a/cfg/Config.mk +++ b/cfg/Config.mk @@ -3,7 +3,7 @@ ### So, to access the directory containing this file, you would use "../" .DEFAULT_GOAL := all -SHELL := /bin/bash +SHELL := /usr/bin/env bash ## specifies which architecture we're building for ARCH ?= x86_64