Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install fixes for MacOS (and remove the extra v) #986

Merged
merged 3 commits into from
Oct 6, 2023
Merged

Install fixes for MacOS (and remove the extra v) #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5810a41
Remove the extra 'v' in version. All tags 'cept one start already
drewc Oct 6, 2023
70a58c7
Turn `find` into `gfind` on Darwin for install to work,
drewc Oct 6, 2023
bfaada5
Merge branch 'master' into build-fixes
vyzo Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ package_out_of_tree() {
echo "It is now available as an external package: github.com/mighty-gerbils/gerbil-${pkg}"
}

readonly gerbil_version="v$(git describe --tags --always)"
readonly gerbil_version="$(git describe --tags --always)"
readonly gerbil_targets=""
readonly default_gambit_tag=24201248effa23d5017be4992b5b9879e4cd3a4c
readonly default_gambit_config="--enable-targets=${gerbil_targets} --enable-single-host --enable-dynamic-clib --enable-default-runtime-options=tE8,f8,-8 --enable-trust-c-tco"
Expand Down
1 change: 1 addition & 0 deletions homebrew/README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ Now the things it depends on.
depends_on "sqlite"
depends_on "zlib"
depends_on "gcc"
depends_on "findutils"

fails_with :clang do
cause "gerbil-scheme is built with GCC"
Expand Down
1 change: 1 addition & 0 deletions homebrew/gerbil-scheme.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class GerbilScheme < Formula
depends_on "sqlite"
depends_on "zlib"
depends_on "gcc"
depends_on "findutils"

fails_with :clang do
cause "gerbil-scheme is built with GCC"
Expand Down
10 changes: 9 additions & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ die() {
exit 1
}

if [ $(uname) = "Darwin" ];
then
FIND=gfind
else
FIND=find
fi


install() {
local prefix="${1}"
mkdir -p "${prefix}" || die
Expand Down Expand Up @@ -40,7 +48,7 @@ install_src_files() {
local dest="${2}"
local oldpwd="$(pwd)"
cd "${src}"
for f in $(find -name \*.ss -or -name \*.ssi -or -name \*.scm -or -name \*.c | egrep -v "/[.]gerbil" | grep -v build.ss); do
for f in $(${FIND} -name \*.ss -or -name \*.ssi -or -name \*.scm -or -name \*.c | egrep -v "/[.]gerbil" | grep -v build.ss); do
mkdir -p $(dirname "${dest}/${f}") || die
cp -v "${f}" "${dest}/${f}" || die
done
Expand Down