Skip to content

Fix unable to build on macOS #53

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

Merged
ManlyMarco merged 3 commits into from
Apr 17, 2024
Merged

Fix unable to build on macOS #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981b563
Upgrade xmake version to 2.8.9
mo10 Apr 17, 2024
c869002
Run configure before build xmake
mo10 Apr 17, 2024
1614de5
Remove make build
mo10 Apr 17, 2024
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
21 changes: 6 additions & 15 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
esac
done

XMAKE_VERSION="2.6.1"
XMAKE_VERSION="2.8.9"

# Get current dir
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down Expand Up @@ -229,27 +229,18 @@ if [[ ! -d "$XMAKE_DIR" ]] || [[ ! -x "$xmake" ]]; then
fi

log-8601-local "Downloading and building xmake, this might take a while..."
if commands_exist xz; then
pack=xz
elif command_exist gzip; then
if commands_exist gzip; then
pack=gz
else
msg-error "No decompression binary found, please install xz or gzip to continue"
msg-error "No decompression binary found, please install gzip to continue"
fi

log-8601-local "Downloading xmake runner..."
curl -fSL "https://github.com/xmake-io/xmake/releases/download/v$XMAKE_VERSION/xmake-v$XMAKE_VERSION.$pack.run" > "$TOOLS_DIR/xmake.run"
log-8601-local "Downloading xmake maybe..."
sh "$TOOLS_DIR/xmake.run" --noexec --target "$XMAKE_BUILD_DIR"
log-8601-local "Building xmake..."
if (cd "$XMAKE_BUILD_DIR" && $make build); then
msg-success "Build successful"
else
msg-error "Failed to build xmake"
exit 1
fi
log-8601-local "Installing xmake..."
if (cd "$XMAKE_BUILD_DIR" && DESTDIR="$TOOLS_DIR" PREFIX="xmake" $make install); then
log-8601-local "Buinding and installing xmake..."
if (cd "$XMAKE_BUILD_DIR" && ./configure && DESTDIR="$TOOLS_DIR" PREFIX="xmake" $make install); then
msg-success "xmake installed successfully"
else
msg-error "Failed to install xmake"
Expand All @@ -263,4 +254,4 @@ do
log-8601-local "Building for $arch..."
"$xmake" f -a $arch -m $PROFILE --include_logging=$WITH_LOGGING
"$xmake" "$@"
done
done