wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #988 from tymcauley/macos-readlink

Browse Source 
Fix readlink on macOS
This commit is contained in:
Abraham Gonzalez
2021-09-27 22:34:58 -07:00
committed by GitHub
parent 05b309f97d 4516e906b3
commit 4c53c41cd3
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build-toolchains.sh
View File

@@ -6,9 +6,16 @@
set -e set -e
set -o pipefail set -o pipefail
# On macOS, use GNU readlink from 'coreutils' package in Homebrew/MacPorts
if [ "$(uname -s)" = "Darwin" ] ; then
READLINK=greadlink
else
READLINK=readlink
fi
# If BASH_SOURCE is undefined, we may be running under zsh, in that case # If BASH_SOURCE is undefined, we may be running under zsh, in that case
# provide a zsh-compatible alternative # provide a zsh-compatible alternative
DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")" DIR="$(dirname "$($READLINK -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
CHIPYARD_DIR="$(dirname "$DIR")" CHIPYARD_DIR="$(dirname "$DIR")"
usage() { usage() {

9
scripts/init-submodules-no-riscv-tools-nolog.sh
View File

@@ -17,9 +17,16 @@ if [ "$MINGIT" != "$(echo -e "$MINGIT\n$MYGIT" | sort -V | head -n1)" ]; then
false false
fi fi
# On macOS, use GNU readlink from 'coreutils' package in Homebrew/MacPorts
if [ "$(uname -s)" = "Darwin" ] ; then
READLINK=greadlink
else
READLINK=readlink
fi
# If BASH_SOURCE is undefined we may be running under zsh, in that case # If BASH_SOURCE is undefined we may be running under zsh, in that case
# provide a zsh-compatible alternative # provide a zsh-compatible alternative
DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")" DIR="$(dirname "$($READLINK -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
CHIPYARD_DIR="$(dirname "$DIR")" CHIPYARD_DIR="$(dirname "$DIR")"
cd "$CHIPYARD_DIR" cd "$CHIPYARD_DIR"