Skip to content

Commit 6e06038

Browse files
committed
fix: Fix the libqrencode build under MacOS 10.15
1 parent 6758e68 commit 6e06038

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

platform/macos/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ ccache --zero-stats
9494
-DCMAKE_BUILD_TYPE=Release \
9595
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_VERSION" \
9696
-DCMAKE_PREFIX_PATH="$PREFIX_PATH" \
97+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
9798
-GNinja \
9899
-B_build \
99100
"$@" \

tools/circleci-bazel-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TMPDIR=$(mktemp -d)
5252
trap 'rm -rf "$TMPDIR"' EXIT
5353

5454
pushd /src/workspace
55-
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"
55+
curl -L https://github.com/buchgr/bazel-remote/releases/download/v2.6.1/bazel-remote-2.6.1-linux-amd64 -o "$TMPDIR/bazel-remote"
5656
# TODO(iphydf): Use bazel once the image is updated.
5757
# bazel run @patchelf//:patchelf -- --set-interpreter /nix/store/*-glibc-*/lib64/ld-linux-x86-64.so.2 "$TMPDIR/bazel-remote"
5858
"$PATCHELF" --set-interpreter /nix/store/*-glibc-*/lib64/ld-linux-x86-64.so.2 "$TMPDIR/bazel-remote"

0 commit comments

Comments
 (0)