folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix apple silicon build problems Issue #294

Browse source 
- find gnu-getopt when installed by homebrew in /opt
- invoke realpath only on known path components
  (needed for some realpath implementation(s))
  (relevant when build-flavor directory does not yet exist)
This commit is contained in:
Howard Bussey 2023-09-16 16:37:24 -04:00 • committed by Paul Koning
parent 90e4597aa9
commit 8ee2b90dc4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/cmake-builder.sh
View file

@ -82,6 +82,7 @@ cmakeSFlag=
## MacOS workaround: MacOS has an older getopt installed in /usr/bin, brew ## MacOS workaround: MacOS has an older getopt installed in /usr/bin, brew
## has an updated version that installs in a custom place. ## has an updated version that installs in a custom place.
[[ -d /usr/local/opt/gnu-getopt/bin ]] && PATH="/usr/local/opt/gnu-getopt/bin:$PATH" [[ -d /usr/local/opt/gnu-getopt/bin ]] && PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
[[ -d /opt/homebrew/opt/gnu-getopt/bin ]] && PATH="/opt/homebrew/opt/gnu-getopt/bin:$PATH"
[[ -d /usr/local/opt/coreutils/libexec/gnubin ]] && PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" [[ -d /usr/local/opt/coreutils/libexec/gnubin ]] && PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
getopt_prog= getopt_prog=
@ -292,7 +293,7 @@ if [[ "x${simhTopDir}" = x ]]; then
echo "Did this really happen?" echo "Did this really happen?"
exit 1 exit 1
else else
buildSubdir=$(${realpath} "${simhTopDir}/cmake/${buildSubdir}") buildSubdir=$(${realpath} "${simhTopDir}/cmake/")"/${buildSubdir}"
echo "${scriptName}: SIMH top-evel directory: ${simhTopDir}" echo "${scriptName}: SIMH top-evel directory: ${simhTopDir}"
echo "${scriptName}: Build directory: ${buildSubdir}" echo "${scriptName}: Build directory: ${buildSubdir}"
fi fi