Skip to content

fix: Fix the libqrencode build under MacOS 10.15 #200

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

Draft
nickolay168 wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Draft

fix: Fix the libqrencode build under MacOS 10.15 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions platform/macos/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ ccache --zero-stats
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_VERSION" \
-DCMAKE_PREFIX_PATH="$PREFIX_PATH" \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-GNinja \
-B_build \
"$@" \
Expand Down
2 changes: 1 addition & 1 deletion tools/circleci-bazel-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ TMPDIR=$(mktemp -d)
trap 'rm -rf "$TMPDIR"' EXIT

pushd /src/workspace
curl -L https://github.com/buchgr/bazel-remote/releases/download/v2.5.0/bazel-remote-2.5.0-linux-x86_64 -o "$TMPDIR/bazel-remote"
curl -L https://github.com/buchgr/bazel-remote/releases/download/v2.6.1/bazel-remote-2.6.1-linux-amd64 -o "$TMPDIR/bazel-remote"
# TODO(iphydf): Use bazel once the image is updated.
# bazel run @patchelf//:patchelf -- --set-interpreter /nix/store/*-glibc-*/lib64/ld-linux-x86-64.so.2 "$TMPDIR/bazel-remote"
"$PATCHELF" --set-interpreter /nix/store/*-glibc-*/lib64/ld-linux-x86-64.so.2 "$TMPDIR/bazel-remote"
Expand Down
Loading