Skip to content

Commit

Permalink
Makefile: don't hardcode the path for bash (theseus-os#1086)
Browse files Browse the repository at this point in the history
Some systems (e.g., NixOS) don't have `/bin/bash`,
so use the `env` utility to locate `bash` instead.
  • Loading branch information
YtvwlD committed Dec 23, 2023
1 parent ac5712c commit 813015b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cfg/Config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 813015b

Please sign in to comment.